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.25 by cebix, 2000-10-08T18:41:34Z vs.
Revision 1.38 by cebix, 2001-03-29T14:20:53Z

# 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])
12 > AC_ARG_ENABLE(vosf,          [  --enable-vosf           enable video on SEGV signals [default=no]], [WANT_VOSF=$enableval], [WANT_VOSF=no])
13 >
14 > dnl FPU emulation core.
15 > AC_ARG_ENABLE(fpe,
16 > [  --enable-fpe=which      specify which fpu emulator to use [default=opt]],
17 > [ case "$enableval" in
18 >    default)    FPE_CORE="default";; dnl fpu_x86.cpp if i386 architecture, fpu_uae.cpp otherwise
19 >        uae)            FPE_CORE="uae";;
20 >        *)                      AC_MSG_ERROR([--enable-fpe takes only one of the following values: default, uae]);;
21 >  esac
22 > ],
23 > [ FPE_CORE="default"
24 > ])
25 >
26 > dnl Addressing modes.
27   AC_ARG_ENABLE(addressing,
28 < [  --enable-addressing=mode specify the addressing mode to use [default=fastest]],
28 > [  --enable-addressing=AM  specify the addressing mode to use [default=fastest]],
29   [ case "$enableval" in
30      real)       ADDRESSING_TEST_ORDER="real";;
31      direct)     ADDRESSING_TEST_ORDER="direct";;
32      banks)      ADDRESSING_TEST_ORDER="banks";;
33 < dnl fastest)    ADDRESSING_TEST_ORDER="real direct banks";; gb-- will enable later...
34 <    fastest)    ADDRESSING_TEST_ORDER="direct banks";;
22 <    *)          AC_MSG_ERROR([--enable-mem-addressing takes only one of the following values: fastest, real, direct, banks]);;
33 >    fastest)ADDRESSING_TEST_ORDER="direct banks";;
34 >    *)          AC_MSG_ERROR([--enable-addressing takes only one of the following values: fastest, real, direct, banks]);;
35    esac
36   ],
25 – dnl [ ADDRESSING_TEST_ORDER="real direct banks" gb-- will probably reactivate later
37   [ ADDRESSING_TEST_ORDER="direct banks"
38   ])
39 +
40 + dnl External packages.
41   AC_ARG_WITH(esd,             [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
42   AC_ARG_WITH(gtk,             [  --with-gtk              use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
43   AC_ARG_WITH(mon,             [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
# Line 39 | Line 52 | case "$target_os" in
52    netbsd*)      OS_TYPE=netbsd;;
53    freebsd*)     OS_TYPE=freebsd;;
54    solaris*)     OS_TYPE=solaris;;
55 <  *)            OS_TYPE=`echo $target_os | sed -e 's/-/_/'`;;
55 >  *)            OS_TYPE=`echo $target_os | sed -e 's/-/_/' | sed -e 's/\./_/'`;;
56   esac
57   DEFINES="$DEFINES -DOS_$OS_TYPE"
58  
# Line 47 | Line 60 | dnl Target CPU type.
60   HAVE_I386=no
61   HAVE_M68K=no
62   HAVE_SPARC=no
63 + HAVE_POWERPC=no
64   case "$target_cpu" in
65    i386* | i486* | i586* | i686* | i786* ) CPU_TYPE=i386 HAVE_I386=yes;;
66    m68k* ) CPU_TYPE=m68k HAVE_M68K=yes;;
67    sparc* ) CPU_TYPE=sparc HAVE_SPARC=yes;;
68 +  powerpc* ) CPU_TYPE=powerpc HAVE_POWERPC=yes;;
69    *) CPU_TYPE=`echo $target_cpu | sed -e 's/-/_/'`;;
70   esac
71   DEFINES="$DEFINES -DCPU_$CPU_TYPE"
# Line 71 | Line 86 | if [[ "x$WANT_MON" = "xyes" ]]; then
86    if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then
87      AC_MSG_RESULT(yes)
88      AC_DEFINE(ENABLE_MON)
89 <    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"
89 >    MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_z80.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"
90      CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
91      AC_CHECK_LIB(readline, readline)
92      AC_CHECK_LIB(termcap, tputs)
# Line 112 | Line 127 | AC_CHECK_FUNCS(pthread_cancel)
127   dnl If POSIX.4 semaphores are not available, we emulate them with pthread mutexes.
128   SEMSRC=
129   AC_CHECK_FUNCS(sem_init, , [
130 <  if [ "x$HAVE_PTHREADS" = "xyes" ]; then
130 >  if test "x$HAVE_PTHREADS" = "xyes"; then
131      SEMSRC=posix_sem.cpp
132    fi
133   ])
# Line 204 | Line 219 | ETHERSRC=../dummy/ether_dummy.cpp
219   SCSISRC=../dummy/scsi_dummy.cpp
220   AUDIOSRC=../dummy/audio_dummy.cpp
221   EXTRASYSSRCS=
222 < SUPPORTS_NATIVE_M68K=no
222 > CAN_NATIVE_M68K=no
223   case "$target_os" in
224   linux*)
225 <  ETHERSRC=Linux/ether_linux.cpp
211 <  SCSISRC=Linux/scsi_linux.cpp
225 >  ETHERSRC=ether_unix.cpp
226    AUDIOSRC=audio_oss_esd.cpp
227 +  SCSISRC=Linux/scsi_linux.cpp
228    ;;
229 < freebsd*3.*)
229 > freebsd*)
230 >  ETHERSRC=ether_unix.cpp
231    AUDIOSRC=audio_oss_esd.cpp
232    DEFINES="$DEFINES -DBSD_COMP"
233 +  CXXFLAGS="$CXXFLAGS -fpermissive"
234    dnl Check for the CAM library
235    AC_CHECK_LIB(cam, cam_open_btl, HAVE_LIBCAM=yes, HAVE_LIBCAM=no)
236    if [[ "x$HAVE_LIBCAM" = "xno" ]]; then
237      AC_MSG_WARN([Cannot find libcam for SCSI management, disabling SCSI support.])
238    else
239      dnl Check for the sys kernel includes
240 <    AC_CHECK_HEADER(/sys/cam/cam.h)
241 <    if [[ "x$ac_cv_header__sys_cam_cam_h" = "xno" ]]; then
240 >    AC_CHECK_HEADER(camlib.h)
241 >    if [[ "x$ac_cv_header_camlib_h" = "xno" ]]; then
242        dnl In this case I should fix this thing including a "patch"
243        dnl to access directly to the functions in the kernel :) --Orlando
244 <      AC_MSG_WARN([Cannot find kernel includes for CAM library, disabling SCSI support.])
244 >      AC_MSG_WARN([Cannot find includes for CAM library, disabling SCSI support.])
245      else
246        SCSISRC=FreeBSD/scsi_freebsd.cpp
230 –      CXXFLAGS="$CXXFLAGS -I/sys"
231 –      CFLAGS="$CFLAGS -I/sys"
247        LIBS="$LIBS -lcam"
248        DEFINES="$DEFINES -DCAM"
249      fi
250    fi
251    ;;
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 –      SCSISRC=FreeBSD/scsi_freebsd.cpp
250 –      LIBS="$LIBS -lscsi"
251 –    fi
252 –  fi
253 –  ;;
252   netbsd*)
253 <  SUPPORTS_NATIVE_M68K=yes
253 >  CAN_NATIVE_M68K=yes
254    ;;
255   solaris*)
256    AUDIOSRC=Solaris/audio_solaris.cpp
257    DEFINES="$DEFINES -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS"
258    ;;
259   irix*)
260 +  AUDIOSRC=Irix/audio_irix.cpp
261    EXTRASYSSRCS=Irix/unaligned.c
262 <  DEFINES="$DEFINES -DCRTSCTS=CNEW_RTSCTS -DB230400=B115200"
263 <  LIBS="$LIBS -lm"
262 >  dnl IRIX headers work fine, but somehow don't define or use "STDC_HEADERS"
263 >  DEFINES="$DEFINES -DCRTSCTS=CNEW_RTSCTS -DB230400=B115200 -DSTDC_HEADERS"
264 >  LIBS="$LIBS -laudio"
265 >
266 >  dnl Check if our compiler supports -Ofast (MIPSPro)
267 >  HAVE_OFAST=no
268 >  ocflags="$CFLAGS"
269 >  CFLAGS=`echo $CFLAGS | sed -e 's/ -g / -Ofast /;s/^-g /-Ofast /;s/-g$/ -Ofast/;s/^-g$/-Ofast/'`
270 >  AC_MSG_CHECKING(if "-Ofast" works)
271 >  dnl Do a test compile of an empty function
272 >  AC_TRY_COMPILE(,, [AC_MSG_RESULT(yes); HAVE_OFAST=yes], AC_MSG_RESULT(no))
273 >  CFLAGS="$ocflags"
274 >
275    ;;
276   esac
277  
278 + dnl Use 68k CPU natively?
279 + WANT_NATIVE_M68K=no
280 + if [[ "x$HAVE_M68K" = "xyes" -a "x$CAN_NATIVE_M68K" = "xyes" ]]; then
281 +  AC_DEFINE(ENABLE_NATIVE_M68K)
282 +  WANT_NATIVE_M68K=yes
283 + fi
284 +
285   if [[ "x$HAVE_PTHREADS" = "xno" ]]; then
286    dnl Serial, ethernet and audio support needs pthreads
287    AC_MSG_WARN([You don't have pthreads, disabling serial, ethernet and audio support.])
# Line 385 | Line 402 | if [[ "x$ac_cv_have_extended_signals" =
402            AC_LANG_RESTORE
403          ])
404          AC_TRANSLATE_DEFINE(HAVE_SIGCONTEXT_SUBTERFUGE, $ac_cv_have_sigcontext_hack)
405 +      elif [[ "x$HAVE_POWERPC" = "xyes" ]]; then
406 +        AC_CACHE_CHECK("whether we then have a subterfuge for your system",
407 +                  ac_cv_have_sigcontext_hack, [
408 +          AC_LANG_SAVE
409 +          AC_LANG_CPLUSPLUS
410 +          AC_TRY_RUN([
411 +            #include <unistd.h>
412 +            #include <signal.h>
413 +            #include <fcntl.h>
414 +            #include <sys/mman.h>
415 +
416 +            static volatile caddr_t mem = 0;
417 +            static int zero_fd = -1;
418 +
419 +            static RETSIGTYPE segfault_handler(int, struct sigcontext_struct *scs)
420 +            { if ((caddr_t)(scs->regs->dar) != mem) exit(1);
421 +              munmap(mem, getpagesize()); close(zero_fd); exit(0); }
422 +
423 +            int main()
424 +            { if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
425 +              if ((mem = (caddr_t)mmap(0, getpagesize(), PROT_READ, MAP_PRIVATE, zero_fd, 0)) == (caddr_t)MAP_FAILED) exit(1);
426 +              struct sigaction sa; sa.sa_flags = 0;
427 +              sa.sa_handler = (RETSIGTYPE (*)(int))segfault_handler;
428 +              sigaction(SIGSEGV, &sa, 0);
429 +              mem[0] = 0;
430 +              exit(1); // should not be reached
431 +            }
432 +          ],
433 +          [ac_cv_have_sigcontext_hack=yes],
434 +          [ac_cv_have_sigcontext_hack=no]
435 +          )
436 +          AC_LANG_RESTORE
437 +        ])
438 +        AC_TRANSLATE_DEFINE(HAVE_SIGCONTEXT_SUBTERFUGE, $ac_cv_have_sigcontext_hack)
439 +      fi
440 +      ;;
441 +    netbsd*)
442 +      if [[ "x$HAVE_M68K" = "xyes" ]]; then
443 +        AC_CACHE_CHECK("whether we then have a subterfuge for your system",
444 +                  ac_cv_have_sigcontext_hack, [
445 +          AC_LANG_SAVE
446 +          AC_LANG_CPLUSPLUS
447 +          AC_TRY_RUN([
448 +            #include <unistd.h>
449 +            #include <signal.h>
450 +            #include <fcntl.h>
451 +            #include <sys/mman.h>
452 +
453 +            static volatile caddr_t mem = 0;
454 +            static int zero_fd = -1;
455 +
456 +            static RETSIGTYPE segfault_handler(int, int code)
457 +            { if ((caddr_t)code != mem) exit(1);
458 +              munmap(mem, getpagesize()); close(zero_fd); exit(0); }
459 +
460 +            int main()
461 +            { if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
462 +              if ((mem = (caddr_t)mmap(0, getpagesize(), PROT_READ, MAP_PRIVATE, zero_fd, 0)) == (caddr_t)MAP_FAILED) exit(1);
463 +              struct sigaction sa; sa.sa_flags = 0;
464 +              sa.sa_handler = (RETSIGTYPE (*)(int))segfault_handler;
465 +              sigaction(SIGSEGV, &sa, 0);
466 +              mem[0] = 0;
467 +              exit(1); // should not be reached
468 +            }
469 +          ],
470 +          [ac_cv_have_sigcontext_hack=yes],
471 +          [ac_cv_have_sigcontext_hack=no]
472 +          )
473 +          AC_LANG_RESTORE
474 +        ])
475 +        AC_TRANSLATE_DEFINE(HAVE_SIGCONTEXT_SUBTERFUGE, $ac_cv_have_sigcontext_hack)
476        fi
477      ;;
478    esac
# Line 397 | Line 485 | if [[ "$ac_cv_have_extended_signals" = "
485   fi
486  
487   dnl Determine the addressing mode to use
488 < ADDRESSING_MODE=""
489 < AC_MSG_CHECKING([for the addressing mode to use])
490 < for am in $ADDRESSING_TEST_ORDER; do
491 <  case $am in
492 <  real)
493 <    dnl Requires ability to mmap Low Memory globals.
494 <    if [[ "x$ac_cv_can_map_lm" = "xno" ]]; then
495 <      continue
496 <    fi
497 <    if [[ "x$ac_cv_c_bigendian" = "xyes" ]]; then
498 <      dnl Requires only VOSF if 16-bit vidmode enable
411 <      if [[ "x$WANT_16BIT_VIDMODE" = "xyes" ]]; then
412 <        if [[ "x$CAN_VOSF" = "xno" ]]; then
413 <          continue
414 <        fi
415 <      else
416 <        DEFINES="$DEFINES -DDISABLE_16BIT_VIDMODE"
488 > if [[ "x$WANT_NATIVE_M68K" = "xyes" ]]; then
489 >  ADDRESSING_MODE="real"
490 > else
491 >  ADDRESSING_MODE=""
492 >  AC_MSG_CHECKING([for the addressing mode to use])
493 >  for am in $ADDRESSING_TEST_ORDER; do
494 >    case $am in
495 >    real)
496 >      dnl Requires ability to mmap() Low Memory globals
497 >      if [[ "x$ac_cv_can_map_lm" = "xno" ]]; then
498 >        continue
499        fi
500 <    else
419 <      dnl Requires VOSF
500 >          dnl Requires VOSF screen updates
501        if [[ "x$CAN_VOSF" = "xno" ]]; then
502          continue
503        fi
504 <    fi
505 <    dnl Real addressing will probably work
425 <    ADDRESSING_MODE="real"
426 <    WANT_VOSF=yes dnl we can use VOSF and we need it actually
427 <    DEFINES="$DEFINES -DREAL_ADDRESSING"
428 <    break
429 <    ;;
430 <  direct)
431 <    dnl Requires VOSF
432 <    if [[ "x$CAN_VOSF" = "xyes" ]]; then
433 <      ADDRESSING_MODE="direct"
504 >      dnl Real addressing will probably work.
505 >      ADDRESSING_MODE="real"
506        WANT_VOSF=yes dnl we can use VOSF and we need it actually
507 <      DEFINES="$DEFINES -DDIRECT_ADDRESSING"
507 >      DEFINES="$DEFINES -DREAL_ADDRESSING"
508        break
509 <    fi
510 <    ;;
511 <  banks)
512 <    dnl Default addressing mode
509 >      ;;
510 >    direct)
511 >      dnl Requires VOSF screen updates
512 >      if [[ "x$CAN_VOSF" = "xyes" ]]; then
513 >        ADDRESSING_MODE="direct"
514 >        WANT_VOSF=yes dnl we can use VOSF and we need it actually
515 >        DEFINES="$DEFINES -DDIRECT_ADDRESSING"
516 >        break
517 >      fi
518 >      ;;
519 >    banks)
520 >      dnl Default addressing mode
521 >      ADDRESSING_MODE="memory banks"
522 >      break
523 >      ;;
524 >    *)
525 >      AC_MSG_ERROR([Internal configure.in script error for $am addressing mode])
526 >    esac
527 >  done
528 >  AC_MSG_RESULT($ADDRESSING_MODE)
529 >  if [[ "x$ADDRESSING_MODE" = "x" ]]; then
530 >    AC_MSG_WARN([Sorry, no suitable addressing mode in $ADDRESSING_TEST_ORDER])
531      ADDRESSING_MODE="memory banks"
532 <    break
443 <    ;;
444 <  *)
445 <    AC_MSG_ERROR([Internal configure.in script error for $am addressing mode])
446 <  esac
447 < done
448 < AC_MSG_RESULT($ADDRESSING_MODE)
449 < if [[ "x$ADDRESSING_MODE" = "x" ]]; then
450 <  AC_MSG_WARN([Sorry, no suitable addressing mode in $ADDRESSING_TEST_ORDER])
451 <  ADDRESSING_MODE="memory banks"
532 >  fi
533   fi
534  
535 < dnl Since real and direct addressing modes automatically activate VOSF,
536 < dnl I put this test here.
456 < if [[ "x$WANT_VOSF" = "xyes" ]]; then
457 <  if [[ "x$CAN_VOSF" = "xno" ]]; then
458 <    AC_MSG_WARN([Sorry, your system does not support Video on SEGV signals])
459 <    WANT_VOSF=no
460 <  else
535 > dnl Enable VOSF screen updates with this feature is requested and feasible
536 > if [[ "x$WANT_VOSF" = "xyes" -a "x$CAN_VOSF" = "xyes" ]]; then
537      AC_DEFINE(ENABLE_VOSF)
538 <  fi
538 > else
539 >    WANT_VOSF=no
540   fi
541  
542   dnl Check for GAS.
# Line 489 | Line 566 | fi
566  
567   dnl Select appropriate CPU source and REGPARAM define.
568   ASM_OPTIMIZATIONS=none
492 – WANT_NATIVE_M68K=no
569   CPUSRCS="cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp"
570   FPUSRCS="../uae_cpu/fpp.cpp"
571 < if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" ]]; then
571 > if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" -a "x$OS_TYPE" != "xfreebsd" ]]; then
572    dnl i386 CPU
573    DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\""
574    if [[ "x$HAVE_GAS" = "xyes" ]]; then
575      ASM_OPTIMIZATIONS=i386
576 <    DEFINES="$DEFINES -DX86_ASSEMBLY -DOPTFLAGS"
577 <    CPUSRCS="../uae_cpu/compiler.cpp cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
576 >    DEFINES="$DEFINES -DX86_ASSEMBLY -DUNALIGNED_PROFITABLE -DOPTIMIZED_FLAGS"
577 >    CPUSRCS="cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
578      FPUSRCS="../uae_cpu/fpu_x86.cpp"
579    fi
580   elif [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_SPARC" = "xyes" -a "x$HAVE_GAS" = "xyes" ]]; then
# Line 510 | Line 586 | elif [[ "x$HAVE_GCC27" = "xyes" -a "x$HA
586      AC_MSG_RESULT($SPARC_TYPE)
587      case "$SPARC_TYPE" in
588      SPARC_V8)
589 <          ASM_OPTIMIZATIONS="SPARC V8 architecture"
590 <      DEFINES="$DEFINES -DSPARC_V8_ASSEMBLY" dnl -DOPTFLAGS"
589 >      ASM_OPTIMIZATIONS="SPARC V8 architecture"
590 >      DEFINES="$DEFINES -DSPARC_V8_ASSEMBLY" dnl -DOPTIMIZED_FLAGS"
591        CFLAGS="$CFLAGS -Wa,-Av8"
592        CXXFLAGS="$CXXFLAGS -Wa,-Av8"
593        ;;
594      SPARC_V9)
595 <          ASM_OPTIMIZATIONS="SPARC V9 architecture"
596 <      DEFINES="$DEFINES -DSPARC_V9_ASSEMBLY" dnl -DOPTFLAGS"
595 >      ASM_OPTIMIZATIONS="SPARC V9 architecture"
596 >      DEFINES="$DEFINES -DSPARC_V9_ASSEMBLY" dnl -DOPTIMIZED_FLAGS"
597        CFLAGS="$CFLAGS -Wa,-Av9"
598        CXXFLAGS="$CXXFLAGS -Wa,-Av9"
599        ;;
600      esac
601      ;;
602    esac
603 < elif [[ "x$HAVE_M68K" = "xyes" -a "x$SUPPORTS_NATIVE_M68K" = "xyes" ]]; then
603 > elif [[ "x$WANT_NATIVE_M68K" = "xyes" ]]; then
604    dnl Native m68k, no emulation
605 <  CPUSRCS=""
606 <  AC_DEFINE(ENABLE_NATIVE_M68K)
531 <  WANT_NATIVE_M68K=yes
605 >  CPUINCLUDES="-I../native_cpu"
606 >  CPUSRCS="asm_support.s"
607   fi
608  
609 + dnl Select appropriate FPU source.
610 + dnl 1. Optimized X86 assembly core if target is i386 architecture
611 + SAVED_DEFINES=$DEFINES
612 + if [[ "x$FPE_CORE" = "xdefault" ]]; then
613 +  if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" -a "x$HAVE_GAS" = "xyes" ]]; then
614 +    DEFINES="$DEFINES -DFPU_X86"
615 +    FPE_CORE_STR="i386 optimized core"
616 +    FPUSRCS="../uae_cpu/fpu/fpu_x86.cpp"
617 +  else
618 +    FPE_CORE="uae"
619 +  fi
620 + fi
621 +
622 + dnl 2. JIT-FPU only supports IEEE-based implementation.
623 + if [[ "x$WANT_JIT_FPU" = "xyes" -a "x$FPE_CORE" != "xieee" ]]; then
624 +  AC_MSG_WARN([Sorry, JIT-FPU supports only the "ieee" FPE implementation])
625 +  FPE_CORE="ieee"
626 +  dnl Restore previous variables. FPE_CORE_STR and FPUSRCS are overwritten
627 +  DEFINES=$SAVED_DEFINES
628 + fi
629 +
630 + dnl 3. Choose either IEEE-based implementation or the old UAE core
631 + if [[ "x$FPE_CORE" = "xieee" ]]; then
632 +  AC_CHECK_HEADERS(fenv.h)
633 +  AC_CHECK_FUNCS(feclearexcept fegetexceptflag feraiseexcept fesetexceptflag fetestexcept)
634 +  AC_CHECK_FUNCS(fegetround fesetround)
635 +  DEFINES="$DEFINES -DFPU_IEEE"
636 +  FPE_CORE_STR="ieee-based fpu core"
637 +  FPUSRCS="../uae_cpu/fpu/fpu_ieee.cpp"
638 + elif [[ "x$FPE_CORE" = "xuae" ]]; then
639 +  DEFINES="$DEFINES -DFPU_UAE"
640 +  FPE_CORE_STR="original uae core"
641 +  FPUSRCS="../uae_cpu/fpu/fpu_uae.cpp"
642 + fi
643 +
644 + dnl Check for certain math functions
645 + AC_CHECK_FUNCS(atanh)
646 + AC_CHECK_FUNCS(isnan isinf)             dnl C99
647 + AC_CHECK_FUNCS(isnanl isinfl)   dnl IEEE ?
648 +
649   dnl UAE CPU sources for all non-m68k-native architectures.
650   if [[ "x$WANT_NATIVE_M68K" = "xno" ]]; then
651    CPUINCLUDES="-I../uae_cpu"
652    CPUSRCS="../uae_cpu/basilisk_glue.cpp ../uae_cpu/memory.cpp ../uae_cpu/newcpu.cpp ../uae_cpu/readcpu.cpp $FPUSRCS cpustbl.cpp cpudefs.cpp $CPUSRCS"
538 – else
539 –  CPUINCLUDES="-I../native_cpu"
540 –  CPUSRCS="asm_support.s"
653   fi
654  
655   dnl Remove the "-g" option if set for GCC.
656   if [[ "x$HAVE_GCC27" = "xyes" ]]; then
657 <        dnl gb-- Probably not the cleanest way to take
658 <        CFLAGS=`echo $CFLAGS | sed -e 's/ -g / /;s/^-g / /;s/ -g$/ /;s/^-g$//'`
659 <        CXXFLAGS=`echo $CXXFLAGS | sed -e 's/ -g / /;s/^-g / /;s/ -g$/ /;s/^-g$//'`
657 >  dnl gb-- Probably not the cleanest way to take
658 >  CFLAGS=`echo $CFLAGS | sed -e 's/ -g / /;s/^-g / /;s/ -g$/ /;s/^-g$//'`
659 >  CXXFLAGS=`echo $CXXFLAGS | sed -e 's/ -g / /;s/^-g / /;s/ -g$/ /;s/^-g$//'`
660 > fi
661 >
662 > dnl Or if we have -Ofast
663 > if [[ "x$HAVE_OFAST" = "xyes" ]]; then
664 >  CFLAGS=`echo $CFLAGS | sed -e 's/ -g / -Ofast /;s/^-g /-Ofast /;s/-g$/ -Ofast/;s/^-g$/-Ofast/'`
665 >  CXXFLAGS=`echo $CXXFLAGS | sed -e 's/ -g / -Ofast /;s/^-g /-Ofast/;s/ -g$/ -Ofast/;s/^-g$/-Ofast/'`
666 >  CXXFLAGS="-LANG:std $CXXFLAGS"
667 >  LDFLAGS="$LDFLAGS -Ofast"
668   fi
669  
670   dnl Generate Makefile.
# Line 566 | Line 686 | echo ESD sound support ................
686   echo GTK user interface ............... : $WANT_GTK
687   echo mon debugger support ............. : $WANT_MON
688   echo Running m68k code natively ....... : $WANT_NATIVE_M68K
689 + echo Floating-Point emulation core .... : $FPE_CORE_STR
690   echo Assembly optimizations ........... : $ASM_OPTIMIZATIONS
691   echo Addressing mode .................. : $ADDRESSING_MODE
692   echo

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines