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.33 by cebix, 2001-02-10T15:29:01Z vs.
Revision 1.52 by cebix, 2002-01-22T17:15:09Z

# Line 1 | Line 1
1   dnl Process this file with autoconf to produce a configure script.
2 < dnl Written in 1999 by Christian Bauer et al.
2 > dnl Written in 2002 by Christian Bauer et al.
3  
4   AC_INIT(main_unix.cpp)
5   AC_PREREQ(2.12)
6   AC_CONFIG_HEADER(config.h)
7  
8 + dnl These defines are necessary to get 64-bit file size support.
9 + AC_DEFINE(_USE_LARGEFILE_SOURCE, 1, [Get more functions for correct standard I/O])
10 + AC_DEFINE(_FILE_OFFSET_BITS, 64, [Get 64-bit file size support])
11 +
12   dnl Options.
13   AC_ARG_ENABLE(xf86-dga,      [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
14   AC_ARG_ENABLE(xf86-vidmode,  [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
15   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])
16 < AC_ARG_ENABLE(vosf,          [  --enable-vosf           enable video on SEGV signals [default=no]], [WANT_VOSF=$enableval], [WANT_VOSF=no])
16 > AC_ARG_ENABLE(vosf,          [  --enable-vosf           enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes])
17 >
18 > dnl FPU emulation core.
19 > AC_ARG_ENABLE(fpe,
20 > [  --enable-fpe=which      specify which fpu emulator to use [default=opt]],
21 > [ case "$enableval" in
22 >    default)    FPE_CORE="default";; dnl fpu_x86.cpp if i386 architecture, fpu_uae.cpp otherwise
23 >        uae)            FPE_CORE="uae";;
24 >        *)                      AC_MSG_ERROR([--enable-fpe takes only one of the following values: default, uae]);;
25 >  esac
26 > ],
27 > [ FPE_CORE="default"
28 > ])
29  
30   dnl Addressing modes.
31   AC_ARG_ENABLE(addressing,
# Line 40 | Line 56 | case "$target_os" in
56    netbsd*)      OS_TYPE=netbsd;;
57    freebsd*)     OS_TYPE=freebsd;;
58    solaris*)     OS_TYPE=solaris;;
59 <  *)            OS_TYPE=`echo $target_os | sed -e 's/-/_/' | sed -e 's/\./_/'`;;
59 >  darwin*)      OS_TYPE=darwin;;
60 >  *)            OS_TYPE=`echo $target_os | sed -e 's/-/_/g' | sed -e 's/\./_/g'`;;
61   esac
62   DEFINES="$DEFINES -DOS_$OS_TYPE"
63  
# Line 54 | Line 71 | case "$target_cpu" in
71    m68k* ) CPU_TYPE=m68k HAVE_M68K=yes;;
72    sparc* ) CPU_TYPE=sparc HAVE_SPARC=yes;;
73    powerpc* ) CPU_TYPE=powerpc HAVE_POWERPC=yes;;
74 <  *) CPU_TYPE=`echo $target_cpu | sed -e 's/-/_/'`;;
74 >  *) CPU_TYPE=`echo $target_cpu | sed -e 's/-/_/g'`;;
75   esac
76   DEFINES="$DEFINES -DCPU_$CPU_TYPE"
77  
# Line 74 | Line 91 | if [[ "x$WANT_MON" = "xyes" ]]; then
91    if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then
92      AC_MSG_RESULT(yes)
93      AC_DEFINE(ENABLE_MON)
94 <    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"
94 >    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/mon_lowmem.cpp $mon_srcdir/disass/floatformat.c $mon_srcdir/disass/i386-dis.c $mon_srcdir/disass/m68k-dis.c $mon_srcdir/disass/m68k-opc.c"
95      CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
96      AC_CHECK_LIB(readline, readline)
97      AC_CHECK_LIB(termcap, tputs)
# Line 88 | Line 105 | fi
105  
106   dnl Checks for libraries.
107   AC_CHECK_LIB(posix4, sem_init)
108 + AC_CHECK_LIB(rt, timer_create)
109  
110   dnl We need X11.
111   AC_PATH_XTRA
# Line 154 | Line 172 | UISRCS=../dummy/prefs_editor_dummy.cpp
172   if [[ "x$WANT_GTK" = "xyes" ]]; then
173    AM_PATH_GTK(1.2.0, [
174      AC_DEFINE(ENABLE_GTK)
157    CFLAGS="$CFLAGS $GTK_CFLAGS"
175      CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
176      LIBS="$LIBS $GTK_LIBS"
177      UISRCS=prefs_editor_gtk.cpp
178 +    B2_PATH_GNOMEUI([
179 +      AC_DEFINE(HAVE_GNOMEUI)
180 +      CXXFLAGS="$CXXFLAGS $GNOMEUI_CFLAGS"
181 +      LIBS="$LIBS $GNOMEUI_LIBS"
182 +    ], [])
183    ], [
184      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
185      WANT_GTK=no
# Line 179 | Line 201 | fi
201  
202   dnl Checks for header files.
203   AC_HEADER_STDC
204 < AC_CHECK_HEADERS(unistd.h fcntl.h sys/time.h)
204 > AC_CHECK_HEADERS(unistd.h fcntl.h sys/time.h sys/mman.h)
205  
206   dnl Checks for typedefs, structures, and compiler characteristics.
207   AC_C_BIGENDIAN
# Line 192 | Line 214 | AC_CHECK_SIZEOF(long long, 8)
214   AC_CHECK_SIZEOF(void *, 4)
215   AC_TYPE_OFF_T
216   AC_CHECK_TYPE(loff_t, off_t)
217 + TYPE_SOCKLEN_T
218   AC_TYPE_SIZE_T
219   AC_TYPE_SIGNAL
220   AC_HEADER_TIME
# Line 200 | Line 223 | AC_STRUCT_TM
223   dnl Checks for library functions.
224   AC_CHECK_FUNCS(strdup cfmakeraw)
225   AC_CHECK_FUNCS(clock_gettime timer_create)
226 + AC_CHECK_FUNCS(sigaction signal)
227 + AC_CHECK_FUNCS(mmap mprotect munmap)
228 + AC_CHECK_FUNCS(vm_allocate vm_deallocate vm_protect)
229 +
230 + dnl Darwin seems to define mach_task_self() instead of task_self().
231 + AC_CHECK_FUNCS(mach_task_self task_self)
232  
233   dnl Select system-dependant source files.
234   SERIALSRC=serial_unix.cpp
# Line 210 | Line 239 | EXTRASYSSRCS=
239   CAN_NATIVE_M68K=no
240   case "$target_os" in
241   linux*)
242 <  ETHERSRC=Linux/ether_linux.cpp
214 <  SCSISRC=Linux/scsi_linux.cpp
242 >  ETHERSRC=ether_unix.cpp
243    AUDIOSRC=audio_oss_esd.cpp
244 +  SCSISRC=Linux/scsi_linux.cpp
245    ;;
246 < freebsd*3.*)
246 > freebsd*)
247 >  ETHERSRC=ether_unix.cpp
248    AUDIOSRC=audio_oss_esd.cpp
249    DEFINES="$DEFINES -DBSD_COMP"
250 +  CXXFLAGS="$CXXFLAGS -fpermissive"
251    dnl Check for the CAM library
252    AC_CHECK_LIB(cam, cam_open_btl, HAVE_LIBCAM=yes, HAVE_LIBCAM=no)
253    if [[ "x$HAVE_LIBCAM" = "xno" ]]; then
254      AC_MSG_WARN([Cannot find libcam for SCSI management, disabling SCSI support.])
255    else
256      dnl Check for the sys kernel includes
257 <    AC_CHECK_HEADER(/sys/cam/cam.h)
258 <    if [[ "x$ac_cv_header__sys_cam_cam_h" = "xno" ]]; then
257 >    AC_CHECK_HEADER(camlib.h)
258 >    if [[ "x$ac_cv_header_camlib_h" = "xno" ]]; then
259        dnl In this case I should fix this thing including a "patch"
260        dnl to access directly to the functions in the kernel :) --Orlando
261 <      AC_MSG_WARN([Cannot find kernel includes for CAM library, disabling SCSI support.])
261 >      AC_MSG_WARN([Cannot find includes for CAM library, disabling SCSI support.])
262      else
263        SCSISRC=FreeBSD/scsi_freebsd.cpp
233      CXXFLAGS="$CXXFLAGS -I/sys"
234      CFLAGS="$CFLAGS -I/sys"
264        LIBS="$LIBS -lcam"
265        DEFINES="$DEFINES -DCAM"
266      fi
267    fi
268    ;;
240 freebsd*)
241  DEFINES="$DEFINES -DBSD_COMP"
242  dnl Check for the SCSI library
243  AC_CHECK_LIB(scsi, scsi_open, HAVE_LIBSCSI=yes, HAVE_LIBSCSI=no)
244  if [[ "x$HAVE_LIBSCSI" = "xno" ]]; then
245    AC_MSG_WARN([Cannot find libscsi for SCSI management, disabling SCSI support.])
246  else
247    dnl Check for the sys kernel includes
248    AC_CHECK_HEADER(scsi.h sys/scsiio.h)
249    if [[ "x$ac_cv_header_scsi_h" = "xno" ]]; then
250      AC_MSG_WARN([Cannot find includes for the SCSI library, disabling SCSI support.])
251    else
252      SCSISRC=FreeBSD/scsi_freebsd.cpp
253      LIBS="$LIBS -lscsi"
254    fi
255  fi
256  ;;
269   netbsd*)
270    CAN_NATIVE_M68K=yes
271    ;;
# Line 262 | Line 274 | solaris*)
274    DEFINES="$DEFINES -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS"
275    ;;
276   irix*)
277 +  ETHERSRC=ether_unix.cpp
278    AUDIOSRC=Irix/audio_irix.cpp
279    EXTRASYSSRCS=Irix/unaligned.c
280    dnl IRIX headers work fine, but somehow don't define or use "STDC_HEADERS"
281    DEFINES="$DEFINES -DCRTSCTS=CNEW_RTSCTS -DB230400=B115200 -DSTDC_HEADERS"
282    LIBS="$LIBS -laudio"
283 +  WANT_ESD=no
284 +
285 +  dnl Check if our compiler supports -Ofast (MIPSPro)
286 +  HAVE_OFAST=no
287 +  ocflags="$CFLAGS"
288 +  CFLAGS=`echo $CFLAGS | sed -e 's/ -g / -Ofast /;s/^-g /-Ofast /;s/-g$/ -Ofast/;s/^-g$/-Ofast/'`
289 +  AC_MSG_CHECKING(if "-Ofast" works)
290 +  dnl Do a test compile of an empty function
291 +  AC_TRY_COMPILE(,, [AC_MSG_RESULT(yes); HAVE_OFAST=yes], AC_MSG_RESULT(no))
292 +  CFLAGS="$ocflags"
293 +
294    ;;
295   esac
296  
# Line 291 | Line 315 | dnl to be put into the config.h file
315   dnl $1 -- the macro to define
316   dnl $2 -- the value to translate
317   AC_DEFUN(AC_TRANSLATE_DEFINE, [
318 <    if [[ "x$2" = "xyes" ]]; then
318 >    if [[ "x$2" = "xyes" -o "x$2" = "xguessing yes" ]]; then
319          AC_DEFINE($1)
320      fi
321   ])
322  
323 + dnl Various checks if the system supports vm_allocate() and the like functions.
324 + have_mach_vm=no
325 + if [[ "x$ac_cv_func_vm_allocate" = "xyes" -a "x$ac_cv_func_vm_deallocate" = "xyes" -a \
326 +      "x$ac_cv_func_vm_protect" = "xyes" ]]; then
327 +  have_mach_vm=yes
328 + fi
329 + AC_TRANSLATE_DEFINE(HAVE_MACH_VM, "$have_mach_vm")
330 +
331 + dnl Check that vm_allocate(), vm_protect() work
332 + if [[ "x$have_mach_vm" = "xyes" ]]; then
333 +
334 + AC_CACHE_CHECK("whether vm_protect works",
335 +  ac_cv_vm_protect_works, [
336 +  AC_LANG_SAVE
337 +  AC_LANG_CPLUSPLUS
338 +  ac_cv_vm_protect_works=yes
339 +  dnl First the tests that should segfault
340 +  for test_def in NONE_READ NONE_WRITE READ_WRITE; do
341 +    AC_TRY_RUN([
342 +      #define CONFIGURE_TEST_VM_MAP
343 +      #define TEST_VM_PROT_$test_def
344 +      #include "vm_alloc.cpp"
345 +    ], ac_cv_vm_protect_works=no, rm -f core,
346 +    dnl When cross-compiling, do not assume anything
347 +    ac_cv_vm_protect_works="guessing no"
348 +    )
349 +  done
350 +  AC_TRY_RUN([
351 +    #define CONFIGURE_TEST_VM_MAP
352 +    #define TEST_VM_PROT_RDWR_WRITE
353 +    #include "vm_alloc.cpp"
354 +  ], , ac_cv_vm_protect_works=no,
355 +  dnl When cross-compiling, do not assume anything
356 +  ac_cv_vm_protect_works="guessing no"
357 +  )
358 +  AC_LANG_RESTORE
359 +  ]
360 + )
361 +
362 + dnl Remove support for vm_allocate() if vm_protect() does not work
363 + if [[ "x$have_mach_vm" = "xyes" ]]; then
364 +  case $ac_cv_vm_protect_works in
365 +    *yes) have_mach_vm=yes;;
366 +    *no) have_mach_vm=no;;
367 +  esac
368 + fi
369 + AC_TRANSLATE_DEFINE(HAVE_MACH_VM, "$have_mach_vm")
370 +
371 + fi dnl HAVE_MACH_VM
372 +
373 + dnl Various checks if the system supports mmap() and the like functions.
374 + dnl ... and Mach memory allocators are not supported
375 + have_mmap_vm=no
376 + if [[ "x$ac_cv_func_mmap" = "xyes" -a "x$ac_cv_func_munmap" = "xyes" -a \
377 +      "x$ac_cv_func_mprotect" = "xyes" ]]; then
378 +  if [[ "x$have_mach_vm" = "xno" ]]; then
379 +    have_mmap_vm=yes
380 +  fi
381 + fi
382 + AC_TRANSLATE_DEFINE(HAVE_MMAP_VM, "$have_mmap_vm")
383 +
384 + dnl Check that mmap() and associated functions work.
385 + if [[ "x$have_mmap_vm" = "xyes" ]]; then
386 +
387 + dnl Check if we have a working anonymous mmap()
388 + AC_CACHE_CHECK("whether mmap supports MAP_ANON",
389 +  ac_cv_mmap_anon, [
390 +  AC_LANG_SAVE
391 +  AC_LANG_CPLUSPLUS
392 +  AC_TRY_RUN([
393 +    #define HAVE_MMAP_ANON
394 +    #define CONFIGURE_TEST_VM_MAP
395 +    #define TEST_VM_MMAP_ANON
396 +    #include "vm_alloc.cpp"
397 +  ], ac_cv_mmap_anon=yes, ac_cv_mmap_anon=no,
398 +  dnl When cross-compiling, do not assume anything.
399 +  ac_cv_mmap_anon="guessing no"
400 +  )
401 +  AC_LANG_RESTORE
402 +  ]
403 + )
404 + AC_TRANSLATE_DEFINE(HAVE_MMAP_ANON, "$ac_cv_mmap_anon")
405 +
406 + AC_CACHE_CHECK("whether mmap supports MAP_ANONYMOUS",
407 +  ac_cv_mmap_anonymous, [
408 +  AC_LANG_SAVE
409 +  AC_LANG_CPLUSPLUS
410 +  AC_TRY_RUN([
411 +    #define HAVE_MMAP_ANONYMOUS
412 +    #define CONFIGURE_TEST_VM_MAP
413 +    #define TEST_VM_MMAP_ANON
414 +    #include "vm_alloc.cpp"
415 +  ], ac_cv_mmap_anonymous=yes, ac_cv_mmap_anonymous=no,
416 +  dnl When cross-compiling, do not assume anything.
417 +  ac_cv_mmap_anonymous="guessing no"
418 +  )
419 +  AC_LANG_RESTORE
420 +  ]
421 + )
422 + AC_TRANSLATE_DEFINE(HAVE_MMAP_ANONYMOUS, "$ac_cv_mmap_anonymous")
423 +
424 + AC_CACHE_CHECK("whether mprotect works",
425 +  ac_cv_mprotect_works, [
426 +  AC_LANG_SAVE
427 +  AC_LANG_CPLUSPLUS
428 +  ac_cv_mprotect_works=yes
429 +  dnl First the tests that should segfault
430 +  for test_def in NONE_READ NONE_WRITE READ_WRITE; do
431 +    AC_TRY_RUN([
432 +      #define CONFIGURE_TEST_VM_MAP
433 +      #define TEST_VM_PROT_$test_def
434 +      #include "vm_alloc.cpp"
435 +    ], ac_cv_mprotect_works=no, rm -f core,
436 +    dnl When cross-compiling, do not assume anything
437 +    ac_cv_mprotect_works="guessing no"
438 +    )
439 +  done
440 +  AC_TRY_RUN([
441 +    #define CONFIGURE_TEST_VM_MAP
442 +    #define TEST_VM_PROT_RDWR_WRITE
443 +    #include "vm_alloc.cpp"
444 +  ], , ac_cv_mprotect_works=no,
445 +  dnl When cross-compiling, do not assume anything
446 +  ac_cv_mprotect_works="guessing no"
447 +  )
448 +  AC_LANG_RESTORE
449 +  ]
450 + )
451 +
452 + dnl Remove support for mmap() if mprotect() does not work
453 + if [[ "x$have_mmap_vm" = "xyes" ]]; then
454 +  case $ac_cv_mprotect_works in
455 +    *yes) have_mmap_vm=yes;;
456 +    *no) have_mmap_vm=no;;
457 +  esac
458 + fi
459 + AC_TRANSLATE_DEFINE(HAVE_MMAP_VM, $have_mmap_vm)
460 +
461 + fi dnl HAVE_MMAP_VM
462 +
463   dnl Check if we can mmap 0x2000 bytes from 0x0000
464   AC_CACHE_CHECK("whether we can map Low Memory area 0x0000-0x2000",
465    ac_cv_can_map_lm, [
466    AC_LANG_SAVE
467    AC_LANG_CPLUSPLUS
468    AC_TRY_RUN([
469 <    #include <unistd.h>
470 <    #include <fcntl.h>
471 <    #include <sys/mman.h>
472 <    
473 <    int main()
474 <    { int zero_fd; char * lm;
475 <      if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
476 <      if ((lm = (char *)mmap((caddr_t)0x0000, 0x2000, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE, zero_fd, 0)) == MAP_FAILED) exit(1);
313 <      lm[0] = 0x12;
314 <          munmap(lm, 0x2000);
315 <      close(zero_fd);
316 <      exit(0);
469 >    #include "vm_alloc.cpp"
470 >    int main(void) { /* returns 0 if we could map the lowmem globals */
471 >      volatile char * lm;
472 >      if (vm_init() < 0) exit(1);
473 >      if ((lm = (volatile char *)vm_acquire_fixed(0, 0x2000)) == VM_MAP_FAILED) exit(1);
474 >      lm[0] = 'z';
475 >      if (vm_release((char *)lm, 0x2000) < 0) exit(1);
476 >      vm_exit(); exit(0);
477      }
478 <  ],
479 <  [ac_cv_can_map_lm=yes],
480 <  [ac_cv_can_map_lm=no]
478 >  ], ac_cv_can_map_lm=yes, ac_cv_can_map_lm=no,
479 >  dnl When cross-compiling, do not assume anything.
480 >  ac_cv_can_map_lm="guessing no"
481    )
482    AC_LANG_RESTORE
483    ]
484   )
485  
486 < dnl Check if extended signals are supported.
487 < AC_CACHE_CHECK("whether your system supports extended signal handlers",
488 <  ac_cv_have_extended_signals, [
486 > dnl Check signal handlers need to be reinstalled
487 > AC_CACHE_CHECK("whether signal handlers need to be reinstalled",
488 >  ac_cv_signal_need_reinstall, [
489    AC_LANG_SAVE
490    AC_LANG_CPLUSPLUS
491    AC_TRY_RUN([
332    #include <unistd.h>
492      #include <stdlib.h>
493 +    #ifdef HAVE_UNISTD_H
494 +    #include <unistd.h>
495 +    #endif
496      #include <signal.h>
497 <    #include <fcntl.h>
498 <    #include <sys/mman.h>
499 <
500 <    static volatile caddr_t mem = 0;
501 <    static int zero_fd = -1;
497 >    static int handled_signal = 0;
498 >    RETSIGTYPE sigusr1_handler(int) { handled_signal++; }
499 >    int main(void) { /* returns 0 if signals need not to be reinstalled */
500 >      signal(SIGUSR1, sigusr1_handler); raise(SIGUSR1); raise(SIGUSR1);
501 >      exit(handled_signal == 2);
502 >    }
503 >  ], ac_cv_signal_need_reinstall=yes, ac_cv_signal_need_reinstall=no,
504 >  dnl When cross-compiling, do not assume anything.
505 >  ac_cv_signal_need_reinstall="guessing yes"
506 >  )
507 >  AC_LANG_RESTORE
508 >  ]
509 > )
510 > AC_TRANSLATE_DEFINE(SIGNAL_NEED_REINSTALL, "$ac_cv_signal_need_reinstall")
511  
512 <    static RETSIGTYPE segfault_handler(int, siginfo_t * sip, void *)
513 <    { if ((caddr_t)(sip->si_addr) != mem) exit(1);
514 <      munmap(mem, getpagesize()); close(zero_fd); exit(0); }
515 <
516 <    int main()
517 <    { if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
518 <      if ((mem = (caddr_t)mmap(0, getpagesize(), PROT_READ, MAP_PRIVATE, zero_fd, 0)) == (caddr_t)MAP_FAILED) exit(1);
519 <      struct sigaction sa; sa.sa_sigaction = segfault_handler; sa.sa_flags = SA_SIGINFO;
520 <      sigaction(SIGSEGV, &sa, 0);
521 <      mem[0] = 0;
522 <      exit(1); // should not be reached
512 > dnl Check if sigaction handlers need to be reinstalled
513 > AC_CACHE_CHECK("whether sigaction handlers need to be reinstalled",
514 >  ac_cv_sigaction_need_reinstall, [
515 >  AC_LANG_SAVE
516 >  AC_LANG_CPLUSPLUS
517 >  AC_TRY_RUN([
518 >    #include <stdlib.h>
519 >    #ifdef HAVE_UNISTD_H
520 >    #include <unistd.h>
521 >    #endif
522 >    #include <signal.h>
523 >    static int handled_signal = 0;
524 >    RETSIGTYPE sigusr1_handler(int) { handled_signal++; }
525 >    typedef RETSIGTYPE (*signal_handler)(int);
526 >    static signal_handler mysignal(int sig, signal_handler handler) {
527 >      struct sigaction old_sa;
528 >      struct sigaction new_sa;
529 >      new_sa.sa_handler = handler;
530 >      return ((sigaction(sig,&new_sa,&old_sa) < 0) ? SIG_IGN : old_sa.sa_handler);
531      }
532 <  ],
533 <  [ac_cv_have_extended_signals=yes],
534 <  [ac_cv_have_extended_signals=no]
532 >    int main(void) { /* returns 0 if signals need not to be reinstalled */
533 >      mysignal(SIGUSR1, sigusr1_handler); raise(SIGUSR1); raise(SIGUSR1);
534 >      exit(handled_signal == 2);
535 >    }
536 >  ], ac_cv_sigaction_need_reinstall=yes, ac_cv_sigaction_need_reinstall=no,
537 >  dnl When cross-compiling, do not assume anything.
538 >  ac_cv_sigaction_need_reinstall="guessing yes"
539 >  )
540 >  AC_LANG_RESTORE
541 >  ]
542 > )
543 > AC_TRANSLATE_DEFINE(SIGACTION_NEED_REINSTALL, "$ac_cv_sigaction_need_reinstall")
544 >
545 > dnl Check if extended signals are supported.
546 > AC_CACHE_CHECK("whether your system supports extended signal handlers",
547 >  ac_cv_have_extended_signals, [
548 >  AC_LANG_SAVE
549 >  AC_LANG_CPLUSPLUS
550 >  AC_TRY_RUN([
551 >    #define HAVE_SIGINFO_T 1
552 >    #define CONFIGURE_TEST_SIGSEGV_RECOVERY
553 >    #include "vm_alloc.cpp"
554 >    #include "sigsegv.cpp"
555 >  ], ac_cv_have_extended_signals=yes, ac_cv_have_extended_signals=no,
556 >  dnl When cross-compiling, do not assume anything.
557 >  ac_cv_have_extended_signals=no
558    )
559    AC_LANG_RESTORE
560    ]
# Line 361 | Line 563 | AC_TRANSLATE_DEFINE(HAVE_SIGINFO_T, "$ac
563  
564   dnl Otherwise, check for subterfuges.
565   if [[ "x$ac_cv_have_extended_signals" = "xno" ]]; then
566 <  case "$target_os" in
567 <    linux*)
568 <      if [[ "x$HAVE_I386" = "xyes" ]]; then
569 <        AC_CACHE_CHECK("whether we then have a subterfuge for your system",
570 <                  ac_cv_have_sigcontext_hack, [
571 <          AC_LANG_SAVE
572 <          AC_LANG_CPLUSPLUS
573 <          AC_TRY_RUN([
574 <            #include <unistd.h>
575 <            #include <signal.h>
576 <            #include <fcntl.h>
577 <            #include <sys/mman.h>
578 <
579 <            static volatile caddr_t mem = 0;
580 <            static int zero_fd = -1;
581 <
380 <            static RETSIGTYPE segfault_handler(int, struct sigcontext scs)
381 <            { if ((caddr_t)(scs.cr2) != mem) exit(1);
382 <              munmap(mem, getpagesize()); close(zero_fd); exit(0); }
383 <
384 <            int main()
385 <            { if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
386 <              if ((mem = (caddr_t)mmap(0, getpagesize(), PROT_READ, MAP_PRIVATE, zero_fd, 0)) == (caddr_t)MAP_FAILED) exit(1);
387 <              struct sigaction sa; sa.sa_flags = 0;
388 <              sa.sa_handler = (RETSIGTYPE (*)(int))segfault_handler;
389 <              sigaction(SIGSEGV, &sa, 0);
390 <              mem[0] = 0;
391 <              exit(1); // should not be reached
392 <            }
393 <          ],
394 <          [ac_cv_have_sigcontext_hack=yes],
395 <          [ac_cv_have_sigcontext_hack=no]
396 <          )
397 <          AC_LANG_RESTORE
398 <        ])
399 <        AC_TRANSLATE_DEFINE(HAVE_SIGCONTEXT_SUBTERFUGE, $ac_cv_have_sigcontext_hack)
400 <      elif [[ "x$HAVE_POWERPC" = "xyes" ]]; then
401 <        AC_CACHE_CHECK("whether we then have a subterfuge for your system",
402 <                  ac_cv_have_sigcontext_hack, [
403 <          AC_LANG_SAVE
404 <          AC_LANG_CPLUSPLUS
405 <          AC_TRY_RUN([
406 <            #include <unistd.h>
407 <            #include <signal.h>
408 <            #include <fcntl.h>
409 <            #include <sys/mman.h>
410 <
411 <            static volatile caddr_t mem = 0;
412 <            static int zero_fd = -1;
413 <
414 <            static RETSIGTYPE segfault_handler(int, struct sigcontext_struct *scs)
415 <            { if ((caddr_t)(scs->regs->dar) != mem) exit(1);
416 <              munmap(mem, getpagesize()); close(zero_fd); exit(0); }
417 <
418 <            int main()
419 <            { if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
420 <              if ((mem = (caddr_t)mmap(0, getpagesize(), PROT_READ, MAP_PRIVATE, zero_fd, 0)) == (caddr_t)MAP_FAILED) exit(1);
421 <              struct sigaction sa; sa.sa_flags = 0;
422 <              sa.sa_handler = (RETSIGTYPE (*)(int))segfault_handler;
423 <              sigaction(SIGSEGV, &sa, 0);
424 <              mem[0] = 0;
425 <              exit(1); // should not be reached
426 <            }
427 <          ],
428 <          [ac_cv_have_sigcontext_hack=yes],
429 <          [ac_cv_have_sigcontext_hack=no]
430 <          )
431 <          AC_LANG_RESTORE
432 <        ])
433 <        AC_TRANSLATE_DEFINE(HAVE_SIGCONTEXT_SUBTERFUGE, $ac_cv_have_sigcontext_hack)
434 <      fi
435 <      ;;
436 <    netbsd*)
437 <      if [[ "x$HAVE_M68K" = "xyes" ]]; then
438 <        AC_CACHE_CHECK("whether we then have a subterfuge for your system",
439 <                  ac_cv_have_sigcontext_hack, [
440 <          AC_LANG_SAVE
441 <          AC_LANG_CPLUSPLUS
442 <          AC_TRY_RUN([
443 <            #include <unistd.h>
444 <            #include <signal.h>
445 <            #include <fcntl.h>
446 <            #include <sys/mman.h>
447 <
448 <            static volatile caddr_t mem = 0;
449 <            static int zero_fd = -1;
450 <
451 <            static RETSIGTYPE segfault_handler(int, int code)
452 <            { if ((caddr_t)code != mem) exit(1);
453 <              munmap(mem, getpagesize()); close(zero_fd); exit(0); }
454 <
455 <            int main()
456 <            { if ((zero_fd = open("/dev/zero", O_RDWR)) < 0) exit(1);
457 <              if ((mem = (caddr_t)mmap(0, getpagesize(), PROT_READ, MAP_PRIVATE, zero_fd, 0)) == (caddr_t)MAP_FAILED) exit(1);
458 <              struct sigaction sa; sa.sa_flags = 0;
459 <              sa.sa_handler = (RETSIGTYPE (*)(int))segfault_handler;
460 <              sigaction(SIGSEGV, &sa, 0);
461 <              mem[0] = 0;
462 <              exit(1); // should not be reached
463 <            }
464 <          ],
465 <          [ac_cv_have_sigcontext_hack=yes],
466 <          [ac_cv_have_sigcontext_hack=no]
467 <          )
468 <          AC_LANG_RESTORE
469 <        ])
470 <        AC_TRANSLATE_DEFINE(HAVE_SIGCONTEXT_SUBTERFUGE, $ac_cv_have_sigcontext_hack)
471 <      fi
472 <    ;;
473 <  esac
566 >  AC_CACHE_CHECK("whether we then have a subterfuge for your system",
567 >  ac_cv_have_sigcontext_hack, [
568 >    AC_LANG_SAVE
569 >    AC_LANG_CPLUSPLUS
570 >    AC_TRY_RUN([
571 >      #define HAVE_SIGCONTEXT_SUBTERFUGE 1
572 >      #define CONFIGURE_TEST_SIGSEGV_RECOVERY
573 >      #include "vm_alloc.cpp"
574 >      #include "sigsegv.cpp"
575 >    ], ac_cv_have_sigcontext_hack=yes, ac_cv_have_sigcontext_hack=no,
576 >    dnl When cross-compiling, do not assume anything.
577 >    ac_cv_have_sigcontext_hack=no
578 >    )
579 >    AC_LANG_RESTORE
580 >  ])
581 >  AC_TRANSLATE_DEFINE(HAVE_SIGCONTEXT_SUBTERFUGE, "$ac_cv_have_sigcontext_hack")
582   fi
583  
584   dnl Can we do Video on SEGV Signals ?
# Line 553 | Line 661 | AC_EGREP_CPP(yes,
661   #endif
662   ], [AC_MSG_RESULT(yes); HAVE_GCC27=yes], AC_MSG_RESULT(no))
663  
664 + dnl Check for GCC 3.0 or higher.
665 + HAVE_GCC30=no
666 + AC_MSG_CHECKING(for GCC 3.0 or higher)
667 + AC_EGREP_CPP(yes,
668 + [#if __GNUC__ >= 3
669 +  yes
670 + #endif
671 + ], [AC_MSG_RESULT(yes); HAVE_GCC30=yes], AC_MSG_RESULT(no))
672 +
673   dnl Set "-fomit-frame-pointer" on i386 GCC 2.7 or higher.
674   if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" ]]; then
675    CFLAGS="$CFLAGS -fomit-frame-pointer"
676    CXXFLAGS="$CXXFLAGS -fomit-frame-pointer"
677   fi
678  
679 + dnl (gb) Do not merge constants since it breaks fpu/fpu_x86.cpp.
680 + dnl As of 2001/08/02, this affects the following compilers:
681 + dnl Official: probably gcc-3.1 (mainline CVS)
682 + dnl Mandrake: gcc-2.96 >= 0.59mdk, gcc-3.0.1 >= 0.1mdk
683 + dnl Red Hat : gcc-2.96 >= 89, gcc-3.0 >= 1
684 + if [[ "x$HAVE_GCC27" = "xyes" ]]; then
685 +  SAVED_CXXFLAGS="$CXXFLAGS"
686 +  CXXFLAGS="$CXXFLAGS -fno-merge-constants"
687 +  AC_CACHE_CHECK([whether GCC supports constants merging], ac_cv_gcc_constants_merging, [
688 +    AC_LANG_SAVE
689 +    AC_LANG_CPLUSPLUS
690 +    AC_TRY_COMPILE([],[],[ac_cv_gcc_constants_merging=yes],[ac_cv_gcc_constants_merging=no])
691 +    AC_LANG_RESTORE
692 +  ])
693 +  if [[ "x$ac_cv_gcc_constants_merging" != "xyes" ]]; then
694 +    CXXFLAGS="$SAVED_CXXFLAGS"
695 +  fi
696 + fi
697 +
698   dnl Select appropriate CPU source and REGPARAM define.
699   ASM_OPTIMIZATIONS=none
700   CPUSRCS="cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp"
701 < FPUSRCS="../uae_cpu/fpp.cpp"
702 < if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" ]]; then
701 > FPUSRCS="../uae_cpu/fpu/fpu_uae.cpp"
702 > if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" -a "x$OS_TYPE" != "xfreebsd" ]]; then
703    dnl i386 CPU
704    DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\""
705    if [[ "x$HAVE_GAS" = "xyes" ]]; then
706      ASM_OPTIMIZATIONS=i386
707      DEFINES="$DEFINES -DX86_ASSEMBLY -DUNALIGNED_PROFITABLE -DOPTIMIZED_FLAGS"
708 <    CPUSRCS="../uae_cpu/compiler.cpp cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
708 >    CPUSRCS="cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
709      FPUSRCS="../uae_cpu/fpu_x86.cpp"
710    fi
711   elif [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_SPARC" = "xyes" -a "x$HAVE_GAS" = "xyes" ]]; then
# Line 601 | Line 737 | elif [[ "x$WANT_NATIVE_M68K" = "xyes" ]]
737    CPUSRCS="asm_support.s"
738   fi
739  
740 + dnl Select appropriate FPU source.
741 + dnl 1. Optimized X86 assembly core if target is i386 architecture
742 + SAVED_DEFINES=$DEFINES
743 + if [[ "x$FPE_CORE" = "xdefault" ]]; then
744 +  if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" -a "x$HAVE_GAS" = "xyes" ]]; then
745 +    DEFINES="$DEFINES -DFPU_X86"
746 +    FPE_CORE_STR="i386 optimized core"
747 +    FPUSRCS="../uae_cpu/fpu/fpu_x86.cpp"
748 +    FPE_CORE="i386"
749 +  else
750 +    FPE_CORE="uae"
751 +  fi
752 + fi
753 +
754 + dnl 2. JIT-FPU only supports IEEE-based implementation.
755 + if [[ "x$WANT_JIT_FPU" = "xyes" -a "x$FPE_CORE" != "xieee" ]]; then
756 +  AC_MSG_WARN([Sorry, JIT-FPU supports only the "ieee" FPE implementation])
757 +  FPE_CORE="ieee"
758 +  dnl Restore previous variables. FPE_CORE_STR and FPUSRCS are overwritten
759 +  DEFINES=$SAVED_DEFINES
760 + fi
761 +
762 + dnl 3. Choose either IEEE-based implementation or the old UAE core
763 + if [[ "x$FPE_CORE" = "xieee" ]]; then
764 +  AC_CHECK_HEADERS(fenv.h)
765 +  AC_CHECK_FUNCS(feclearexcept fegetexceptflag feraiseexcept fesetexceptflag fetestexcept)
766 +  AC_CHECK_FUNCS(fegetround fesetround)
767 +  DEFINES="$DEFINES -DFPU_IEEE"
768 +  FPE_CORE_STR="ieee-based fpu core"
769 +  FPUSRCS="../uae_cpu/fpu/fpu_ieee.cpp"
770 + elif [[ "x$FPE_CORE" = "xuae" ]]; then
771 +  DEFINES="$DEFINES -DFPU_UAE"
772 +  FPE_CORE_STR="original uae core"
773 +  FPUSRCS="../uae_cpu/fpu/fpu_uae.cpp"
774 + fi
775 +
776 + dnl Check for certain math functions
777 + AC_CHECK_FUNCS(atanh)
778 + AC_CHECK_FUNCS(isnan isinf)             dnl C99
779 + AC_CHECK_FUNCS(isnanl isinfl)   dnl IEEE ?
780 +
781   dnl UAE CPU sources for all non-m68k-native architectures.
782   if [[ "x$WANT_NATIVE_M68K" = "xno" ]]; then
783    CPUINCLUDES="-I../uae_cpu"
# Line 609 | Line 786 | fi
786  
787   dnl Remove the "-g" option if set for GCC.
788   if [[ "x$HAVE_GCC27" = "xyes" ]]; then
789 <  dnl gb-- Probably not the cleanest way to take
790 <  CFLAGS=`echo $CFLAGS | sed -e 's/ -g / /;s/^-g / /;s/ -g$/ /;s/^-g$//'`
791 <  CXXFLAGS=`echo $CXXFLAGS | sed -e 's/ -g / /;s/^-g / /;s/ -g$/ /;s/^-g$//'`
789 >  CFLAGS=`echo $CFLAGS | sed -e 's/-g//g'`
790 >  CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-g//g'`
791 > fi
792 >
793 > dnl Or if we have -Ofast
794 > if [[ "x$HAVE_OFAST" = "xyes" ]]; then
795 >  CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'` -Ofast"
796 >  CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-g//g'` -Ofast"
797 >  CXXFLAGS="-LANG:std $CXXFLAGS"
798 >  LDFLAGS="$LDFLAGS -Ofast"
799   fi
800  
801   dnl Generate Makefile.
# Line 633 | Line 817 | echo ESD sound support ................
817   echo GTK user interface ............... : $WANT_GTK
818   echo mon debugger support ............. : $WANT_MON
819   echo Running m68k code natively ....... : $WANT_NATIVE_M68K
820 + echo Floating-Point emulation core .... : $FPE_CORE_STR
821   echo Assembly optimizations ........... : $ASM_OPTIMIZATIONS
822   echo Addressing mode .................. : $ADDRESSING_MODE
823   echo

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines