ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/Unix/configure.in
(Generate patch)

Comparing BasiliskII/src/Unix/configure.in (file contents):
Revision 1.22 by gbeauche, 2000-09-05T16:55:16Z vs.
Revision 1.24 by cebix, 2000-09-25T17:54:01Z

# Line 9 | Line 9 | dnl Options.
9   AC_ARG_ENABLE(xf86-dga,      [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
10   AC_ARG_ENABLE(xf86-vidmode,  [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
11   AC_ARG_ENABLE(fbdev-dga,     [  --enable-fbdev-dga      use direct frame buffer access via /dev/fb [default=yes]], [WANT_FBDEV_DGA=$enableval], [WANT_FBDEV_DGA=yes])
12 + AC_ARG_ENABLE(vosf,          [  --enable-vosf           enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=no])
13 + AC_ARG_ENABLE(16bit-vidmode, [  --enable-16bit-vidmode  enable 16-bit video if possible [default=yes]], [WANT_16BIT_VIDMODE=$enableval], [WANT_16BIT_VIDMODE=yes])
14 + AC_ARG_ENABLE(addressing,
15 + [  --enable-addressing=mode specify the addressing mode to use [default=fastest]],
16 + [ case "$enableval" in
17 +    real)       ADDRESSING_TEST_ORDER="real";;
18 +    direct)     ADDRESSING_TEST_ORDER="direct";;
19 +    banks)      ADDRESSING_TEST_ORDER="banks";;
20 + dnl fastest)    ADDRESSING_TEST_ORDER="real direct banks";; gb-- will enable later...
21 +    fastest)    ADDRESSING_TEST_ORDER="direct banks";;
22 +    *)          AC_MSG_ERROR([--enable-mem-addressing takes only one of the following values: fastest, real, direct, banks]);;
23 +  esac
24 + ],
25 + dnl [ ADDRESSING_TEST_ORDER="real direct banks" gb-- will probably reactivate later
26 + [ ADDRESSING_TEST_ORDER="direct banks"
27 + ])
28   AC_ARG_WITH(esd,             [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
29   AC_ARG_WITH(gtk,             [  --with-gtk              use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
30   AC_ARG_WITH(mon,             [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
31  
32 + dnl Canonical system information.
33 + AC_CANONICAL_HOST
34 + AC_CANONICAL_TARGET
35 +
36 + dnl Target OS type (target is host if not cross-compiling).
37 + case "$target_os" in
38 +  linux*)       OS_TYPE=linux;;
39 +  netbsd*)      OS_TYPE=netbsd;;
40 +  freebsd*)     OS_TYPE=freebsd;;
41 +  solaris*)     OS_TYPE=solaris;;
42 +  *)            OS_TYPE=`echo $target_os | sed -e 's/-/_/'`;;
43 + esac
44 + DEFINES="$DEFINES -DOS_$OS_TYPE"
45 +
46 + dnl Target CPU type.
47 + HAVE_I386=no
48 + HAVE_M68K=no
49 + HAVE_SPARC=no
50 + case "$target_cpu" in
51 +  i386* | i486* | i586* | i686* | i786* ) CPU_TYPE=i386 HAVE_I386=yes;;
52 +  m68k* ) CPU_TYPE=m68k HAVE_M68K=yes;;
53 +  sparc* ) CPU_TYPE=sparc HAVE_SPARC=yes;;
54 +  *) CPU_TYPE=`echo $target_cpu | sed -e 's/-/_/'`;;
55 + esac
56 + DEFINES="$DEFINES -DCPU_$CPU_TYPE"
57 +
58   dnl Checks for programs.
59   AC_PROG_CC
60 + AC_PROG_CC_C_O
61   AC_PROG_CPP
62   AC_PROG_CXX
63   AC_PROG_MAKE_SET
64   AC_PROG_INSTALL
65  
23 dnl Check for i386 target CPU.
24 HAVE_I386=no
25 AC_MSG_CHECKING(for x86 target CPU)
26 AC_EGREP_CPP(yes,
27 [
28 #ifdef __i386__
29  yes
30 #endif
31 ], [AC_MSG_RESULT(yes); HAVE_I386=yes], AC_MSG_RESULT(no))
32
33 dnl Check for SPARC target CPU.
34 HAVE_SPARC=no
35 AC_MSG_CHECKING(for SPARC target CPU)
36 AC_EGREP_CPP(yes,
37 [
38 #ifdef __sparc__
39  yes
40 #endif
41 ], [AC_MSG_RESULT(yes); HAVE_SPARC=yes], AC_MSG_RESULT(no))
42
43 dnl Check for m68k target CPU.
44 HAVE_M68K=no
45 AC_MSG_CHECKING(for m68k target CPU)
46 AC_EGREP_CPP(yes,
47 [
48 #ifdef __m68k__
49  yes
50 #endif
51 ], [AC_MSG_RESULT(yes); HAVE_M68K=yes], AC_MSG_RESULT(no))
52
66   dnl We use mon if possible.
67   MONSRCS=
68   if [[ "x$WANT_MON" = "xyes" ]]; then
69    AC_MSG_CHECKING(for mon)
70 <  if grep mon_init ../../../mon/src/mon.h >/dev/null 2>/dev/null; then
70 >  mon_srcdir=../../../mon/src
71 >  if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then
72      AC_MSG_RESULT(yes)
73      AC_DEFINE(ENABLE_MON)
74 <    MONSRCS="../../../mon/src/mon.cpp ../../../mon/src/mon_6502.cpp ../../../mon/src/mon_68k.cpp ../../../mon/src/mon_8080.cpp ../../../mon/src/mon_cmd.cpp ../../../mon/src/mon_ppc.cpp ../../../mon/src/mon_x86.cpp"
75 <    CXXFLAGS="$CXXFLAGS -I../../../mon/src"
74 >    MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_8080.cpp $mon_srcdir/mon_cmd.cpp $mon_srcdir/mon_disass.cpp $mon_srcdir/mon_ppc.cpp $mon_srcdir/disass/floatformat.c $mon_srcdir/disass/i386-dis.c $mon_srcdir/disass/m68k-dis.c $mon_srcdir/disass/m68k-opc.c"
75 >    CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
76      AC_CHECK_LIB(readline, readline)
77      AC_CHECK_LIB(termcap, tputs)
78      AC_CHECK_HEADERS(readline.h history.h readline/readline.h readline/history.h)
# Line 172 | Line 186 | AC_CHECK_SIZEOF(short, 2)
186   AC_CHECK_SIZEOF(int, 4)
187   AC_CHECK_SIZEOF(long, 4)
188   AC_CHECK_SIZEOF(long long, 8)
189 + AC_CHECK_SIZEOF(void *, 4)
190   AC_TYPE_OFF_T
191   AC_CHECK_TYPE(loff_t, off_t)
192   AC_TYPE_SIZE_T
193 + AC_TYPE_SIGNAL
194   AC_HEADER_TIME
195   AC_STRUCT_TM
196  
# Line 189 | Line 205 | SCSISRC=../dummy/scsi_dummy.cpp
205   AUDIOSRC=../dummy/audio_dummy.cpp
206   EXTRASYSSRCS=
207   SUPPORTS_NATIVE_M68K=no
208 < if MACHINE=`uname -s 2>/dev/null`; then
209 <  case "$MACHINE" in
210 <  Linux*)
211 <    ETHERSRC=Linux/ether_linux.cpp
212 <    SCSISRC=Linux/scsi_linux.cpp
213 <    AUDIOSRC=audio_oss_esd.cpp
214 <    ;;
215 <  FreeBSD*3.*)
216 <    AUDIOSRC=audio_oss_esd.cpp
217 <    DEFINES="$DEFINES -DBSD_COMP"
218 <    dnl Check for the CAM library
219 <    AC_CHECK_LIB(cam, cam_open_btl, HAVE_LIBCAM=yes, HAVE_LIBCAM=no)
220 <    if [[ "x$HAVE_LIBCAM" = "xno" ]]; then
221 <      AC_MSG_WARN([Cannot find libcam for SCSI management, disabling SCSI support.])
208 > case "$target_os" in
209 > linux*)
210 >  ETHERSRC=Linux/ether_linux.cpp
211 >  SCSISRC=Linux/scsi_linux.cpp
212 >  AUDIOSRC=audio_oss_esd.cpp
213 >  ;;
214 > freebsd*3.*)
215 >  AUDIOSRC=audio_oss_esd.cpp
216 >  DEFINES="$DEFINES -DBSD_COMP"
217 >  dnl Check for the CAM library
218 >  AC_CHECK_LIB(cam, cam_open_btl, HAVE_LIBCAM=yes, HAVE_LIBCAM=no)
219 >  if [[ "x$HAVE_LIBCAM" = "xno" ]]; then
220 >    AC_MSG_WARN([Cannot find libcam for SCSI management, disabling SCSI support.])
221 >  else
222 >    dnl Check for the sys kernel includes
223 >    AC_CHECK_HEADER(/sys/cam/cam.h)
224 >    if [[ "x$ac_cv_header__sys_cam_cam_h" = "xno" ]]; then
225 >      dnl In this case I should fix this thing including a "patch"
226 >      dnl to access directly to the functions in the kernel :) --Orlando
227 >      AC_MSG_WARN([Cannot find kernel includes for CAM library, disabling SCSI support.])
228      else
229 <      dnl Check for the sys kernel includes
230 <      AC_CHECK_HEADER(/sys/cam/cam.h)
231 <      if [[ "x$ac_cv_header__sys_cam_cam_h" = "xno" ]]; then
232 <        dnl In this case I should fix this thing including a "patch"
233 <        dnl to access directly to the functions in the kernel :) --Orlando
212 <        AC_MSG_WARN([Cannot find kernel includes for CAM library, disabling SCSI support.])
213 <      else
214 <        SCSISRC=FreeBSD/scsi_freebsd.cpp
215 <        CXXFLAGS="$CXXFLAGS -I/sys"
216 <        CFLAGS="$CFLAGS -I/sys"
217 <        LIBS="$LIBS -lcam"
218 <        DEFINES="$DEFINES -DCAM"
219 <      fi
229 >      SCSISRC=FreeBSD/scsi_freebsd.cpp
230 >      CXXFLAGS="$CXXFLAGS -I/sys"
231 >      CFLAGS="$CFLAGS -I/sys"
232 >      LIBS="$LIBS -lcam"
233 >      DEFINES="$DEFINES -DCAM"
234      fi
235 <    ;;
236 <  FreeBSD*)
237 <    DEFINES="$DEFINES -DBSD_COMP"
238 <    dnl Check for the SCSI library
239 <    AC_CHECK_LIB(scsi, scsi_open, HAVE_LIBSCSI=yes, HAVE_LIBSCSI=no)
240 <    if [[ "x$HAVE_LIBSCSI" = "xno" ]]; then
241 <      AC_MSG_WARN([Cannot find libscsi for SCSI management, disabling SCSI support.])
235 >  fi
236 >  ;;
237 > freebsd*)
238 >  DEFINES="$DEFINES -DBSD_COMP"
239 >  dnl Check for the SCSI library
240 >  AC_CHECK_LIB(scsi, scsi_open, HAVE_LIBSCSI=yes, HAVE_LIBSCSI=no)
241 >  if [[ "x$HAVE_LIBSCSI" = "xno" ]]; then
242 >    AC_MSG_WARN([Cannot find libscsi for SCSI management, disabling SCSI support.])
243 >  else
244 >    dnl Check for the sys kernel includes
245 >    AC_CHECK_HEADER(scsi.h sys/scsiio.h)
246 >    if [[ "x$ac_cv_header_scsi_h" = "xno" ]]; then
247 >      AC_MSG_WARN([Cannot find includes for the SCSI library, disabling SCSI support.])
248      else
249 <      dnl Check for the sys kernel includes
250 <      AC_CHECK_HEADER(scsi.h sys/scsiio.h)
231 <      if [[ "x$ac_cv_header_scsi_h" = "xno" ]]; then
232 <        AC_MSG_WARN([Cannot find includes for the SCSI library, disabling SCSI support.])
233 <      else
234 <        SCSISRC=FreeBSD/scsi_freebsd.cpp
235 <        LIBS="$LIBS -lscsi"
236 <      fi
249 >      SCSISRC=FreeBSD/scsi_freebsd.cpp
250 >      LIBS="$LIBS -lscsi"
251      fi
252 <    ;;
253 <  NetBSD*)
254 <    SUPPORTS_NATIVE_M68K=yes
255 <    ;;
256 <  SunOS*)
257 <    AUDIOSRC=Solaris/audio_solaris.cpp
258 <    DEFINES="$DEFINES -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS"
259 <    ;;
260 <  IRIX*)
261 <    EXTRASYSSRCS=Irix/unaligned.c
262 <    DEFINES="$DEFINES -DCRTSCTS=CNEW_RTSCTS -DB230400=B115200"
263 <    LIBS="$LIBS -lm"
264 <    ;;
265 <  esac
266 < fi
252 >  fi
253 >  ;;
254 > netbsd*)
255 >  SUPPORTS_NATIVE_M68K=yes
256 >  ;;
257 > solaris*)
258 >  AUDIOSRC=Solaris/audio_solaris.cpp
259 >  DEFINES="$DEFINES -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS"
260 >  ;;
261 > irix*)
262 >  EXTRASYSSRCS=Irix/unaligned.c
263 >  DEFINES="$DEFINES -DCRTSCTS=CNEW_RTSCTS -DB230400=B115200"
264 >  LIBS="$LIBS -lm"
265 >  ;;
266 > esac
267 >
268   if [[ "x$HAVE_PTHREADS" = "xno" ]]; then
269    dnl Serial, ethernet and audio support needs pthreads
270    AC_MSG_WARN([You don't have pthreads, disabling serial, ethernet and audio support.])
# Line 259 | Line 274 | if [[ "x$HAVE_PTHREADS" = "xno" ]]; then
274   fi
275   SYSSRCS="$SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
276  
277 + dnl Define a macro that translates a yesno-variable into a C macro definition
278 + dnl to be put into the config.h file
279 + dnl $1 -- the macro to define
280 + dnl $2 -- the value to translate
281 + AC_DEFUN(AC_TRANSLATE_DEFINE, [
282 +    if [[ "x$2" = "xyes" ]]; then
283 +        AC_DEFINE($1)
284 +    fi
285 + ])
286 +
287 + dnl Check if we can mmap 0x2000 bytes from 0x0000
288 + AC_CACHE_CHECK("whether we can map Low Memory area 0x0000-0x2000",
289 +  ac_cv_can_map_lm, [
290 +  AC_LANG_SAVE
291 +  AC_LANG_CPLUSPLUS
292 +  AC_TRY_RUN([
293 +    #include <unistd.h>
294 +    #include <fcntl.h>
295 +    #include <sys/mman.h>
296 +    
297 +    int main()
298 +    { int zero_fd; char * lm;
299 +      if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
300 +      if ((lm = (char *)mmap((caddr_t)0x0000, 0x2000, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE, zero_fd, 0)) == MAP_FAILED) exit(1);
301 +      lm[0] = 0x12;
302 +          munmap(lm, 0x2000);
303 +      close(zero_fd);
304 +      exit(0);
305 +    }
306 +  ],
307 +  [ac_cv_can_map_lm=yes],
308 +  [ac_cv_can_map_lm=no]
309 +  )
310 +  AC_LANG_RESTORE
311 +  ]
312 + )
313 +
314 + dnl Check if extended signals are supported.
315 + AC_CACHE_CHECK("whether your system supports extended signal handlers",
316 +  ac_cv_have_extended_signals, [
317 +  AC_LANG_SAVE
318 +  AC_LANG_CPLUSPLUS
319 +  AC_TRY_RUN([
320 +    #include <unistd.h>
321 +    #include <signal.h>
322 +    #include <fcntl.h>
323 +    #include <sys/mman.h>
324 +
325 +    static volatile caddr_t mem = 0;
326 +    static int zero_fd = -1;
327 +
328 +    static RETSIGTYPE segfault_handler(int, siginfo_t * sip, void *)
329 +    { if ((caddr_t)(sip->si_addr) != mem) exit(1);
330 +      munmap(mem, getpagesize()); close(zero_fd); exit(0); }
331 +
332 +    int main()
333 +    { if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
334 +      if ((mem = (caddr_t)mmap(0, getpagesize(), PROT_READ, MAP_PRIVATE, zero_fd, 0)) == (caddr_t)MAP_FAILED) exit(1);
335 +      struct sigaction sa; sa.sa_sigaction = segfault_handler; sa.sa_flags = 0;
336 +      sigaction(SIGSEGV, &sa, 0);
337 +      mem[0] = 0;
338 +      exit(1); // should not be reached
339 +    }
340 +  ],
341 +  [ac_cv_have_extended_signals=yes],
342 +  [ac_cv_have_extended_signals=no]
343 +  )
344 +  AC_LANG_RESTORE
345 +  ]
346 + )
347 + AC_TRANSLATE_DEFINE(HAVE_SIGINFO_T, "$ac_cv_have_extended_signals")
348 +
349 + dnl Otherwise, check for subterfuges.
350 + if [[ "x$ac_cv_have_extended_signals" = "xno" ]]; then
351 +  case "$target_os" in
352 +    linux*)
353 +      if [[ "x$HAVE_I386" = "xyes" ]]; then
354 +        AC_CACHE_CHECK("whether we then have a subterfuge for your system",
355 +                  ac_cv_have_sigcontext_hack, [
356 +          AC_LANG_SAVE
357 +          AC_LANG_CPLUSPLUS
358 +          AC_TRY_RUN([
359 +            #include <unistd.h>
360 +            #include <signal.h>
361 +            #include <fcntl.h>
362 +            #include <sys/mman.h>
363 +
364 +            static volatile caddr_t mem = 0;
365 +            static int zero_fd = -1;
366 +
367 +            static RETSIGTYPE segfault_handler(int, struct sigcontext scs)
368 +            { if ((caddr_t)(scs.cr2) != mem) exit(1);
369 +              munmap(mem, getpagesize()); close(zero_fd); exit(0); }
370 +
371 +            int main()
372 +            { if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
373 +              if ((mem = (caddr_t)mmap(0, getpagesize(), PROT_READ, MAP_PRIVATE, zero_fd, 0)) == (caddr_t)MAP_FAILED) exit(1);
374 +              struct sigaction sa; sa.sa_flags = 0;
375 +                          sa.sa_handler = (RETSIGTYPE (*)(int))segfault_handler;
376 +              sigaction(SIGSEGV, &sa, 0);
377 +              mem[0] = 0;
378 +              exit(1); // should not be reached
379 +            }
380 +          ],
381 +          [ac_cv_have_sigcontext_hack=yes],
382 +          [ac_cv_have_sigcontext_hack=no]
383 +          )
384 +          AC_LANG_RESTORE
385 +        ])
386 +                AC_TRANSLATE_DEFINE(HAVE_SIGCONTEXT_SUBTERFUGE, $ac_cv_have_sigcontext_hack)
387 +      fi
388 +    ;;
389 +  esac
390 + fi
391 +
392 + dnl Can we do Video on SEGV Signals ?
393 + CAN_VOSF=no
394 + if [[ "$ac_cv_have_extended_signals" = "yes" -o "$ac_cv_have_sigcontext_hack" = "yes" ]]; then
395 +  CAN_VOSF=yes
396 + fi
397 +
398 + dnl Determine the addressing mode to use
399 + ADDRESSING_MODE=""
400 + AC_MSG_CHECKING([for the addressing mode to use])
401 + for am in $ADDRESSING_TEST_ORDER; do
402 +  case $am in
403 +  real)
404 +    dnl Requires ability to mmap Low Memory globals.
405 +    if [[ "x$ac_cv_can_map_lm" = "xno" ]]; then
406 +      continue
407 +    fi
408 +    if [[ "x$ac_cv_c_bigendian" = "xyes" ]]; then
409 +      dnl Requires only VOSF if 16-bit vidmode enable
410 +      if [[ "x$WANT_16BIT_VIDMODE" = "xyes" ]]; then
411 +        if [[ "x$CAN_VOSF" = "xno" ]]; then
412 +          continue
413 +        fi
414 +      else
415 +        DEFINES="$DEFINES -DDISABLE_16BIT_VIDMODE"
416 +      fi
417 +    else
418 +      dnl Requires VOSF
419 +      if [[ "x$CAN_VOSF" = "xno" ]]; then
420 +        continue
421 +      fi
422 +    fi
423 +    dnl Real addressing will probably work
424 +    ADDRESSING_MODE="real"
425 +    WANT_VOSF=yes dnl we can use VOSF and we need it actually
426 +    DEFINES="$DEFINES -DREAL_ADDRESSING"
427 +    break
428 +    ;;
429 +  direct)
430 +    dnl Requires VOSF
431 +    if [[ "x$CAN_VOSF" = "xyes" ]]; then
432 +      ADDRESSING_MODE="direct"
433 +      WANT_VOSF=yes dnl we can use VOSF and we need it actually
434 +      DEFINES="$DEFINES -DDIRECT_ADDRESSING"
435 +      break
436 +    fi
437 +    ;;
438 +  banks)
439 +    dnl Default addressing mode
440 +    ADDRESSING_MODE="memory banks"
441 +    break
442 +    ;;
443 +  *)
444 +    AC_MSG_ERROR([Internal configure.in script error for $am addressing mode])
445 +  esac
446 + done
447 + AC_MSG_RESULT($ADDRESSING_MODE)
448 + if [[ "x$ADDRESSING_MODE" = "x" ]]; then
449 +  AC_MSG_WARN([Sorry, no suitable addressing mode in $ADDRESSING_TEST_ORDER])
450 +  ADDRESSING_MODE="memory banks"
451 + fi
452 +
453 + dnl Since real and direct addressing modes automatically activate VOSF,
454 + dnl I put this test here.
455 + if [[ "x$WANT_VOSF" = "xyes" ]]; then
456 +  if [[ "x$CAN_VOSF" = "xno" ]]; then
457 +    AC_MSG_WARN([Sorry, your system does not support Video on SEGV signals])
458 +    WANT_VOSF=no
459 +  else
460 +    AC_DEFINE(ENABLE_VOSF)
461 +  fi
462 + fi
463 +
464   dnl Check for GAS.
465   HAVE_GAS=no
466   AC_MSG_CHECKING(for GAS .p2align feature)
# Line 285 | Line 487 | if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE
487   fi
488  
489   dnl Select appropriate CPU source and REGPARAM define.
490 < WANT_X86_ASSEMBLY=no
289 < WANT_SPARC_V8_ASSEMBLY=no
290 < WANT_SPARC_V9_ASSEMBLY=no
490 > ASM_OPTIMIZATIONS=none
491   WANT_NATIVE_M68K=no
492   CPUSRCS="cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp"
493   FPUSRCS="../uae_cpu/fpp.cpp"
# Line 295 | Line 495 | if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE
495    dnl i386 CPU
496    DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\""
497    if [[ "x$HAVE_GAS" = "xyes" ]]; then
498 <    WANT_X86_ASSEMBLY=yes
499 <    DEFINES="$DEFINES -DX86_ASSEMBLY"
498 >    ASM_OPTIMIZATIONS=i386
499 >    DEFINES="$DEFINES -DX86_ASSEMBLY -DOPTFLAGS"
500      CPUSRCS="../uae_cpu/compiler.cpp cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
501      FPUSRCS="../uae_cpu/fpu_x86.cpp"
502    fi
503   elif [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_SPARC" = "xyes" -a "x$HAVE_GAS" = "xyes" ]]; then
504    dnl SPARC CPU
505 <  case "$MACHINE" in
506 <  SunOS*)
505 >  case "$target_os" in
506 >  solaris*)
507      AC_MSG_CHECKING(SPARC CPU architecture)
508      SPARC_TYPE=`Solaris/which_sparc`
509      AC_MSG_RESULT($SPARC_TYPE)
510      case "$SPARC_TYPE" in
511      SPARC_V8)
512 <      WANT_SPARC_V8_ASSEMBLY=yes
513 <      DEFINES="$DEFINES -DSPARC_V8_ASSEMBLY"
512 >          ASM_OPTIMIZATIONS="SPARC V8 architecture"
513 >      DEFINES="$DEFINES -DSPARC_V8_ASSEMBLY" dnl -DOPTFLAGS"
514        CFLAGS="$CFLAGS -Wa,-Av8"
515        CXXFLAGS="$CXXFLAGS -Wa,-Av8"
516        ;;
517      SPARC_V9)
518 <      WANT_SPARC_V9_ASSEMBLY=yes
519 <      DEFINES="$DEFINES -DSPARC_V9_ASSEMBLY"
518 >          ASM_OPTIMIZATIONS="SPARC V9 architecture"
519 >      DEFINES="$DEFINES -DSPARC_V9_ASSEMBLY" dnl -DOPTFLAGS"
520        CFLAGS="$CFLAGS -Wa,-Av9"
521        CXXFLAGS="$CXXFLAGS -Wa,-Av9"
522        ;;
# Line 339 | Line 539 | else
539    CPUSRCS="asm_support.s"
540   fi
541  
542 + dnl Remove the "-g" option if set for GCC.
543 + if [[ "x$HAVE_GCC27" = "xyes" ]]; then
544 +        dnl gb-- Probably not the cleanest way to take
545 +        CFLAGS=`echo $CFLAGS | sed -e 's/ -g / /;s/^-g / /;s/ -g$/ /;s/^-g$//'`
546 +        CXXFLAGS=`echo $CXXFLAGS | sed -e 's/ -g / /;s/^-g / /;s/ -g$/ /;s/^-g$//'`
547 + fi
548 +
549   dnl Generate Makefile.
550   AC_SUBST(DEFINES)
551   AC_SUBST(SYSSRCS)
# Line 353 | Line 560 | echo
560   echo XFree86 DGA support .............. : $WANT_XF86_DGA
561   echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
562   echo fbdev DGA support ................ : $WANT_FBDEV_DGA
563 + echo Enable video on SEGV signals ..... : $WANT_VOSF
564   echo ESD sound support ................ : $WANT_ESD
565   echo GTK user interface ............... : $WANT_GTK
566   echo mon debugger support ............. : $WANT_MON
359 echo i386 assembly optimizations ...... : $WANT_X86_ASSEMBLY
360 echo SPARC V8 assembly optimizations .. : $WANT_SPARC_V8_ASSEMBLY
361 echo SPARC V9 assembly optimizations .. : $WANT_SPARC_V9_ASSEMBLY
567   echo Running m68k code natively ....... : $WANT_NATIVE_M68K
568 + echo Assembly optimizations ........... : $ASM_OPTIMIZATIONS
569 + echo Addressing mode .................. : $ADDRESSING_MODE
570   echo
571   echo "Configuration done. Now type \"make\" (or \"gmake\")."

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines