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

Comparing SheepShaver/src/Unix/configure.ac (file contents):
Revision 1.8 by gbeauche, 2004-11-13T14:09:15Z vs.
Revision 1.61 by gbeauche, 2007-12-30T09:15:00Z

# Line 1 | Line 1
1   dnl Process this file with autoconf to produce a configure script.
2   dnl Written in 2002 by Christian Bauer
3  
4 < AC_INIT([SheepShaver], 2.2, [Christian.Bauer@uni-mainz.de], SheepShaver)
4 > AC_INIT([SheepShaver], 2.3, [Christian.Bauer@uni-mainz.de], SheepShaver)
5   AC_CONFIG_SRCDIR(main_unix.cpp)
6   AC_PREREQ(2.52)
7   AC_CONFIG_HEADER(config.h)
# Line 14 | Line 14 | dnl Some systems do not put corefiles in
14   dnl cores for the configure tests since some are intended to dump core.
15   ulimit -c 0
16  
17 + dnl Invite Cygwin users to build within the Windows/ directory
18 + case $target_os in
19 + *cygwin* | *mingw32*)
20 +  AC_MSG_ERROR([You can only build the Windows version from its directory, Cygwin/X11 is not supported.])
21 +  ;;
22 + esac
23 +
24   dnl Options.
25   AC_ARG_ENABLE(jit,          [  --enable-jit            enable JIT compiler [default=yes]], [WANT_JIT=$enableval], [WANT_JIT=yes])
26   AC_ARG_ENABLE(ppc-emulator, [  --enable-ppc-emulator   use the selected PowerPC emulator [default=auto]], [WANT_EMULATED_PPC=$enableval], [WANT_EMULATED_PPC=auto])
27 + AC_ARG_ENABLE(fbdev-dga,    [  --enable-fbdev-dga      use direct frame buffer access via /dev/fb0 [default=yes]], [WANT_FBDEV_DGA=$enableval], [WANT_FBDEV_DGA=yes])
28   AC_ARG_ENABLE(xf86-dga,     [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
29 < AC_ARG_ENABLE(xf86-vidmode, [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=no]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=no])
29 > AC_ARG_ENABLE(xf86-vidmode, [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
30   AC_ARG_ENABLE(vosf,         [  --enable-vosf           enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes])
31 + AC_ARG_ENABLE(standalone-gui,[  --enable-standalone-gui enable a standalone GUI prefs editor [default=no]], [WANT_STANDALONE_GUI=$enableval], [WANT_STANDALONE_GUI=no])
32   AC_ARG_WITH(esd,            [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
33 < AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
33 > AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]],
34 >  [case "$withval" in
35 >   gtk1)      WANT_GTK="gtk";;
36 >   gtk|gtk2)  WANT_GTK="$withval";;
37 >   yes)       WANT_GTK="gtk2 gtk";;
38 >   *)         WANT_GTK="no";;
39 >   esac],
40 >  [WANT_GTK="gtk2 gtk"])
41   AC_ARG_WITH(mon,            [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
42   AC_ARG_WITH(dgcc,           [  --with-dgcc=COMPILER    use C++ COMPILER to compile synthetic opcodes], [DYNGEN_CC=$withval])
43  
# Line 31 | Line 47 | AC_ARG_ENABLE(addressing,
47    [case "$enableval" in
48     real)        WANT_ADDRESSING_MODE="real";;
49     direct)      WANT_ADDRESSING_MODE="direct";;
50 <   direct,0x*)  WANT_ADDRESSING_MODE="direct"; NATMEM_OFFSET=`echo "$enableval" | sed -n '/direct,\(0[[xX]][[0-9A-Fa-f]]*\)/s//\1/p'`;;
50 >   direct,0x*)  WANT_ADDRESSING_MODE="direct"; NATMEM_OFFSET=`echo "$enableval" | sed -n '/direct,\(0[[xX]][[0-9A-Fa-f]]*\([[UuLl]]\{1,2\}\)\?\)$/s//\1/p'`;;
51     esac],
52    [WANT_ADDRESSING_MODE="real"]
53   )
# Line 48 | Line 64 | AC_PROG_CXX
64   AC_PROG_MAKE_SET
65   AC_PROG_INSTALL
66   AC_PROG_EGREP
67 + AC_PATH_PROGS(FILE, [file false])
68 + AC_PATH_PROG(PERL, [perl])
69  
70   dnl Check for PowerPC target CPU.
71   HAVE_PPC=no
# Line 88 | Line 106 | if [[ "x$WANT_MON" = "xyes" ]]; then
106    if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then
107      AC_MSG_RESULT(yes)
108      AC_DEFINE(ENABLE_MON, 1, [Define if using "mon".])
109 <    MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_z80.cpp $mon_srcdir/mon_cmd.cpp $mon_srcdir/mon_lowmem.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"
109 >    MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_z80.cpp $mon_srcdir/mon_cmd.cpp $mon_srcdir/mon_lowmem.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 $mon_srcdir/disass/mips-dis.c $mon_srcdir/disass/mips-opc.c $mon_srcdir/disass/mips16-opc.c"
110      CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
111      AC_CHECK_LIB(ncurses, tgetent, ,
112        AC_CHECK_LIB(termcap, tgetent, ,
# Line 104 | Line 122 | if [[ "x$WANT_MON" = "xyes" ]]; then
122      WANT_MON=no
123    fi
124   fi
125 + AC_SUBST(MONSRCS)
126  
127   dnl Checks for libraries.
128   AC_CHECK_LIB(posix4, sem_init)
129 + AC_CHECK_LIB(m, cos)
130  
131   dnl Do we need SDL?
132   WANT_SDL=no
# Line 135 | Line 155 | if [[ "x$WANT_SDL" = "xyes" ]]; then
155      LIBS="$LIBS $sdl_libs"
156    else
157      WANT_SDL=no
158 +    WANT_SDL_VIDEO=no
159 +    WANT_SDL_AUDIO=no
160    fi
161    SDL_SUPPORT=`echo "$SDL_SUPPORT" | sed -e "s/^ //"`
162   else
# Line 142 | Line 164 | else
164   fi
165  
166   dnl We need X11, if not using SDL.
167 < if [[ "x$WANT_SDL" = "xno" ]]; then
167 > if [[ "x$WANT_SDL_VIDEO" != "xyes" ]]; then
168    AC_PATH_XTRA
169    if [[ "x$no_x" = "xyes" ]]; then
170      AC_MSG_ERROR([You need X11 to run SheepShaver.])
# Line 155 | Line 177 | fi
177   dnl We need pthreads on non-PowerPC systems. Try libpthread first, then libc_r (FreeBSD), then PTL.
178   HAVE_PTHREADS=yes
179   case $EMULATED_PPC:$target_os in
180 < no:linux*)
180 > no:linux*|no:netbsd*)
181    dnl We do have our own pthread_cancel() implementation
182    AC_DEFINE(HAVE_PTHREAD_CANCEL, 1, [Define if you have the pthread_cancel function.])
183    ;;
# Line 163 | Line 185 | no:linux*)
185    AC_CHECK_LIB(pthread, pthread_create, , [
186      AC_CHECK_LIB(c_r, pthread_create, , [
187        AC_CHECK_LIB(PTL, pthread_create, , [
188 <        AC_MSG_ERROR([You need pthreads to run Basilisk II.])
188 >        dnl XXX remove when no pthreads case is merged
189 >        AC_MSG_ERROR([You need pthreads to run SheepShaver.])
190 >        HAVE_PTHREADS=no
191        ])
192      ])
193    ])
194    AC_CHECK_FUNCS(pthread_cancel)
195 +  AC_CHECK_FUNCS(pthread_cond_init pthread_testcancel)
196    AC_CHECK_FUNCS(pthread_mutexattr_setprotocol)
197    AC_CHECK_FUNCS(pthread_mutexattr_settype)
198    AC_CHECK_FUNCS(pthread_mutexattr_setpshared)
174  if [[ "x$HAVE_PTHREADS" = "xyes" ]]; then
175    AC_DEFINE(HAVE_PTHREADS, 1, [Define if pthreads are available.])
176  fi
199    dnl If POSIX.4 semaphores are not available, we emulate them with pthread mutexes.
200    SEMSRC=
201    AC_CHECK_FUNCS(sem_init, , [
# Line 183 | Line 205 | no:linux*)
205    ])
206    ;;
207   esac
208 + if [[ "x$HAVE_PTHREADS" = "xyes" ]]; then
209 +  AC_DEFINE(HAVE_PTHREADS, 1, [Define if pthreads are available.])
210 + fi
211 +
212 + dnl We use FBDev DGA if possible.
213 + if [[ "x$WANT_FBDEV_DGA" = "xyes" ]]; then
214 +  AC_CHECK_HEADER(linux/fb.h, [
215 +    AC_DEFINE(ENABLE_FBDEV_DGA, 1, [Define if using Linux fbdev extension.])
216 +  ], [
217 +    AC_MSG_WARN([Could not find Linux FBDev extension, ignoring --enable-fbdev-dga.])
218 +    WANT_FBDEV_DGA=no
219 +  ])
220 + fi
221  
222   dnl We use XFree86 DGA if possible.
223   if [[ "x$WANT_XF86_DGA" = "xyes" ]]; then
# Line 208 | Line 243 | fi
243  
244   dnl We use GTK+ if possible.
245   UISRCS=../dummy/prefs_editor_dummy.cpp
246 < if [[ "x$WANT_GTK" = "xyes" ]]; then
246 > case "x$WANT_GTK" in
247 > xgtk2*)
248 >  WANT_GTK=no
249 >  AM_PATH_GTK_2_0(1.3.15, [
250 >    GUI_CFLAGS="$GTK_CFLAGS"
251 >    GUI_LIBS="$GTK_LIBS"
252 >    WANT_GTK=gtk2
253 >  ], [
254 >    case "x${WANT_GTK}x" in
255 >    *gtkx)
256 >      AC_MSG_WARN([Could not find GTK+ 2.0, trying with GTK+ 1.2.])
257 >      WANT_GTK=gtk
258 >      ;;
259 >    *)
260 >      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
261 >      WANT_GTK=no
262 >     ;;
263 >    esac
264 >  ])
265 >  ;;
266 > esac
267 > if [[ "x$WANT_GTK" = "xgtk" ]]; then
268 >  WANT_GTK=no
269    AM_PATH_GTK(1.2.0, [
270 <    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
271 <    CFLAGS="$CFLAGS $GTK_CFLAGS"
272 <    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
216 <    LIBS="$LIBS $GTK_LIBS"
217 <    UISRCS=prefs_editor_gtk.cpp
270 >    GUI_CFLAGS="$GTK_CFLAGS"
271 >    GUI_LIBS="$GTK_LIBS"
272 >    WANT_GTK=gtk
273    ], [
274      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
220    WANT_GTK=no
275    ])
276   fi
277 + if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
278 +  AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
279 +  UISRCS=prefs_editor_gtk.cpp
280 + fi
281 + AC_SUBST(GUI_CFLAGS)
282 + AC_SUBST(GUI_LIBS)
283 +
284 + dnl Build external GUI if requested.
285 + if [[ "$WANT_STANDALONE_GUI" != "yes" ]]; then
286 +  WANT_STANDALONE_GUI=no
287 + fi
288 + if [[ "$WANT_GTK" = "no" ]]; then
289 +  WANT_STANDALONE_GUI=no
290 + fi
291 + AC_SUBST(STANDALONE_GUI, [$WANT_STANDALONE_GUI])
292  
293   dnl We use ESD if possible.
294   if [[ "x$WANT_ESD" = "xyes" ]]; then
295 +  WANT_ESD=no
296    AM_PATH_ESD(0.2.8, [
297      AC_DEFINE(ENABLE_ESD, 1, [Define is using ESD.])
298      CFLAGS="$CFLAGS $ESD_CFLAGS"
299      CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
300      LIBS="$LIBS $ESD_LIBS"
301 +    WANT_ESD=yes
302    ], [
303      AC_MSG_WARN([Could not find ESD, disabling ESD support.])
233    WANT_ESD=no
304    ])
305   fi
306  
# Line 240 | Line 310 | AC_SYS_LARGEFILE
310   dnl Checks for header files.
311   AC_HEADER_STDC
312   AC_HEADER_SYS_WAIT
313 + AC_CHECK_HEADERS(malloc.h stdint.h)
314   AC_CHECK_HEADERS(mach/vm_map.h mach/mach_init.h sys/mman.h)
244 AC_CHECK_HEADERS(sys/time.h sys/times.h sys/socket.h)
315   AC_CHECK_HEADERS(unistd.h fcntl.h byteswap.h dirent.h)
316 < AC_CHECK_HEADERS(linux/if.h, [], [], [
317 < #if HAVE_SYS_SOCKET_H
318 < # include <sys/socket.h>
316 > AC_CHECK_HEADERS(sys/socket.h sys/ioctl.h sys/filio.h sys/bitypes.h sys/wait.h)
317 > AC_CHECK_HEADERS(sys/time.h sys/poll.h sys/select.h arpa/inet.h)
318 > AC_CHECK_HEADERS(linux/if.h linux/if_tun.h net/if.h net/if_tun.h, [], [], [
319 > #ifdef HAVE_SYS_TYPES_H
320 > #include <sys/types.h>
321 > #endif
322 > #ifdef HAVE_SYS_SOCKET_H
323 > #include <sys/socket.h>
324   #endif
325   ])
326 < AC_CHECK_HEADERS(linux/if_tun.h net/if.h net/if_tun.h)
326 > AC_CHECK_HEADERS(AvailabilityMacros.h)
327 > AC_CHECK_HEADERS(IOKit/storage/IOBlockStorageDevice.h)
328 > AC_CHECK_HEADERS(fenv.h)
329  
330   dnl Checks for typedefs, structures, and compiler characteristics.
331   AC_C_BIGENDIAN
# Line 268 | Line 345 | AC_TYPE_SIGNAL
345   AC_HEADER_TIME
346   AC_STRUCT_TM
347  
348 + dnl Check whether sys/socket.h defines type socklen_t.
349 + dnl (extracted from ac-archive/Miscellaneous)
350 + AC_CACHE_CHECK([for socklen_t],
351 +  ac_cv_type_socklen_t, [
352 +  AC_TRY_COMPILE([
353 +    #include <sys/types.h>
354 +    #include <sys/socket.h>
355 +  ], [socklen_t len = 42; return 0;],
356 +  ac_cv_type_socklen_t=yes, ac_cv_type_socklen_t=no,
357 +  dnl When cross-compiling, do not assume anything.
358 +  ac_cv_type_socklen_t="guessing no"
359 +  )
360 + ])
361 + if [[ "x$ac_cv_type_socklen_t" != "xyes" ]]; then
362 +  AC_DEFINE(socklen_t, int, [Define to 'int' if <sys/types.h> doesn't define.])
363 + fi
364 +
365   dnl Check whether struct sigaction has sa_restorer member.
366   AC_CACHE_CHECK([whether struct sigaction has sa_restorer],
367    ac_cv_signal_sa_restorer, [
# Line 284 | Line 378 | if [[ "x$ac_cv_signal_sa_restorer" = "xy
378   fi
379  
380   dnl Checks for library functions.
381 < AC_CHECK_FUNCS(strdup strlcpy cfmakeraw)
381 > AC_CHECK_FUNCS(strdup strerror strlcpy cfmakeraw)
382   AC_CHECK_FUNCS(nanosleep)
383   AC_CHECK_FUNCS(sigaction signal)
384   AC_CHECK_FUNCS(mmap mprotect munmap)
385   AC_CHECK_FUNCS(vm_allocate vm_deallocate vm_protect)
386 < AC_CHECK_FUNCS(posix_memalign memalign valloc)
386 > AC_CHECK_FUNCS(exp2f log2f exp2 log2)
387 > AC_CHECK_FUNCS(floorf roundf ceilf truncf floor round ceil trunc)
388 > AC_CHECK_FUNCS(poll inet_aton)
389  
390   dnl Darwin seems to define mach_task_self() instead of task_self().
391   AC_CHECK_FUNCS(mach_task_self task_self)
# Line 301 | Line 397 | no:linux*)
397    ;;
398   *:*)
399    AC_SEARCH_LIBS(clock_gettime, [rt posix4])
400 <  AC_CHECK_FUNCS(clock_gettime)
400 >  AC_CHECK_FUNCS(clock_gettime clock_nanosleep)
401    ;;
402   esac
403  
404 + dnl Check for headers and functions related to pty support (sshpty.c)
405 + dnl From openssh-3.2.2p1 configure.ac
406 + AC_CHECK_HEADERS(strings.h login.h sys/bsdtty.h sys/stat.h util.h pty.h)
407 + AC_CHECK_FUNCS(_getpty vhangup strlcpy)
408 +
409 + case "$host" in
410 + *-*-hpux10.26)
411 +        disable_ptmx_check=yes
412 +        ;;
413 + *-*-linux*)
414 +        no_dev_ptmx=1
415 +        ;;
416 + mips-sony-bsd|mips-sony-newsos4)
417 +        AC_DEFINE(HAVE_NEWS4, 1, [Define if you are on NEWS-OS (additions from openssh-3.2.2p1, for sshpty.c).])
418 +        ;;
419 + *-*-sco3.2v4*)
420 +        no_dev_ptmx=1
421 +        ;;
422 + *-*-sco3.2v5*)
423 +        no_dev_ptmx=1
424 +        ;;
425 + *-*-cygwin*)
426 +        no_dev_ptmx=1
427 +        ;;
428 + esac
429 +
430 + if test -z "$no_dev_ptmx" ; then
431 +        if test "x$disable_ptmx_check" != "xyes" ; then
432 +                AC_CHECK_FILE([/dev/ptmx],
433 +                        [
434 +                                AC_DEFINE_UNQUOTED(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx.])
435 +                                have_dev_ptmx=1
436 +                        ]
437 +                )
438 +        fi
439 + fi
440 + AC_CHECK_FILE([/dev/ptc],
441 +        [
442 +                AC_DEFINE_UNQUOTED(HAVE_DEV_PTS_AND_PTC, 1, [Define if you have /dev/ptc.])
443 +                have_dev_ptc=1
444 +        ]
445 + )
446 + dnl (end of code from openssh-3.2.2p1 configure.ac)
447 +
448 + dnl Check for systems where POSIX-style non-blocking I/O (O_NONBLOCK)
449 + dnl doesn't work or is unimplemented. On these systems (mostly older
450 + dnl ones), use the old BSD-style FIONBIO approach instead. [tcl.m4]
451 + AC_CACHE_CHECK([FIONBIO vs. O_NONBLOCK for non-blocking I/O],
452 +  ac_cv_nonblocking_io, [
453 +  case "$host" in
454 +  *-*-osf*)
455 +    ac_cv_nonblocking_io=FIONBIO
456 +    ;;
457 +  *-*-sunos4*)
458 +    ac_cv_nonblocking_io=FIONBIO
459 +    ;;
460 +  *-*-ultrix*)
461 +    ac_cv_nonblocking_io=FIONBIO
462 +    ;;
463 +  *)
464 +    ac_cv_nonblocking_io=O_NONBLOCK
465 +    ;;
466 +  esac
467 + ])
468 + if [[ "$ac_cv_nonblocking_io" = "FIONBIO" ]]; then
469 +  AC_DEFINE(USE_FIONBIO, 1, [Define if BSD-style non-blocking I/O is to be used])
470 + fi
471 +
472 + dnl Check whether compiler supports byte bit-fields
473 + AC_CACHE_CHECK([whether compiler supports byte bit-fields],
474 +  ac_cv_have_byte_bitfields, [
475 +  AC_LANG_SAVE
476 +  AC_LANG_CPLUSPLUS
477 +  AC_TRY_RUN([
478 +    struct A {
479 +      unsigned char b1:4;
480 +      unsigned char b2:4;
481 +      unsigned char c;
482 +      unsigned short s;
483 +      unsigned char a[4];
484 +    };
485 +
486 +    int main(void) {
487 +      A a;
488 +      return ! (sizeof(A) == 8 && &a.c == ((unsigned char *)&a + 1));
489 +    }],
490 +    [ac_cv_have_byte_bitfields=yes],
491 +    [ac_cv_have_byte_bitfields=no],
492 +    dnl When cross-compiling, assume only GCC supports this
493 +    [if [[ "$GCC" = "yes" ]]; then
494 +      ac_cv_have_byte_bitfields="guessing yes"
495 +    else
496 +      ac_cv_have_byte_bitfields="guessing no"
497 +    fi]
498 +    )
499 +  AC_LANG_RESTORE
500 + ])
501 +
502   dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES)
503 < AC_DEFUN(AC_CHECK_FRAMEWORK, [
503 > AC_DEFUN([AC_CHECK_FRAMEWORK], [
504    AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])dnl
505    AC_CACHE_CHECK([whether compiler supports framework $1],
506      ac_Framework, [
507      saved_LIBS="$LIBS"
508      LIBS="$LIBS -framework $1"
509      AC_TRY_LINK(
510 <      [$2], [int main(void) { return 0; }],
510 >      [$2], [],
511        [AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no); LIBS="$saved_LIBS"]
512      )
513    ])
# Line 326 | Line 520 | AC_DEFUN(AC_CHECK_FRAMEWORK, [
520   dnl Check for some MacOS X frameworks
521   AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
522   AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
523 + AC_CHECK_FRAMEWORK(CoreFoundation, [#include <CoreFoundation/CoreFoundation.h>])
524 + AC_CHECK_FRAMEWORK(CoreAudio, [#include <CoreAudio/CoreAudio.h>])
525 + AC_CHECK_FRAMEWORK(AudioUnit, [#include <AudioUnit/AudioUnit.h>])
526 + AC_CHECK_FRAMEWORK(AudioToolbox, [#include <AudioToolbox/AudioToolbox.h>])
527  
528   dnl Select system-dependant sources.
529   SERIALSRC=serial_unix.cpp
530   ETHERSRC=../dummy/ether_dummy.cpp
531   SCSISRC=../dummy/scsi_dummy.cpp
532   AUDIOSRC=../dummy/audio_dummy.cpp
533 + PREFSSRC=../dummy/prefs_dummy.cpp
534   EXTFSSRC=extfs_unix.cpp
535   EXTRASYSSRCS=
536   case "$target_os" in
537   linux*)
538 <  ETHERSRC=Linux/ether_linux.cpp
538 >  ETHERSRC=ether_unix.cpp
539    AUDIOSRC=audio_oss_esd.cpp
540    SCSISRC=Linux/scsi_linux.cpp
541    if [[ "x$EMULATED_PPC" = "xno" ]]; then
542 <    EXTRASYSSRCS="Linux/paranoia.cpp Linux/sheepthreads.c Linux/asm_linux.S"
542 >    EXTRASYSSRCS="paranoia.cpp Linux/sheepthreads.c ppc_asm.S"
543 >  fi
544 >  ;;
545 > freebsd*)
546 >  ETHERSRC=ether_unix.cpp
547 >  ;;
548 > netbsd*)
549 >  ETHERSRC=ether_unix.cpp
550 >  if [[ "x$EMULATED_PPC" = "xno" ]]; then
551 >    EXTRASYSSRCS="paranoia.cpp NetBSD/sheepthreads.c ppc_asm.S"
552    fi
553    ;;
554   darwin*)
555 +  ETHERSRC=ether_unix.cpp
556    if [[ "x$EMULATED_PPC" = "xno" ]]; then
557 <    EXTRASYSSRCS="Darwin/paranoia.cpp Linux/asm_linux.S"
557 >    EXTRASYSSRCS="paranoia.cpp ppc_asm.S"
558    fi
559 <  if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
559 >  if [[ "x$ac_cv_framework_IOKit" = "xyes" -a "x$ac_cv_framework_CoreFoundation" = "xyes" ]]; then
560      EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
561    fi
562    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
563 <    EXTFSSRC=../MacOSX/extfs_macosx.mm
563 >    EXTFSSRC=../MacOSX/extfs_macosx.cpp
564 >    PREFSSRC="../MacOSX/prefs_macosx.mm ../MacOSX/PrefsEditor/PrefsEditor.mm"
565 >    CPPFLAGS="$CPPFLAGS -I../MacOSX/PrefsEditor"
566 > fi
567 >  if [[ "x$ac_cv_framework_CoreAudio" = "xyes" ]]; then
568 >    AUDIOSRC="../MacOSX/audio_macosx.cpp ../MacOSX/AudioBackEnd.cpp ../MacOSX/AudioDevice.cpp ../MacOSX/MacOSX_sound_if.cpp"
569    fi
570    ;;
571 + irix*)
572 +  AUDIOSRC=Irix/audio_irix.cpp
573 +  LIBS="$LIBS -laudio"
574 +  WANT_ESD=no
575 +
576 +  dnl Check if our compiler supports -IPA (MIPSPro)
577 +  HAVE_IPA=no
578 +  ocflags="$CFLAGS"
579 +  CFLAGS=`echo " $CFLAGS -IPA" | sed -e "s/ -g //g"`
580 +  AC_MSG_CHECKING(if "-IPA" works)
581 +  dnl Do a test compile of an empty function
582 +  AC_TRY_COMPILE([#if defined __GNUC__
583 +                  # error GCC does not support IPA yet
584 +                  #endif],, [AC_MSG_RESULT(yes); HAVE_IPA=yes], AC_MSG_RESULT(no))
585 +  CFLAGS="$ocflags"
586 +  ;;
587 + esac
588 +
589 + dnl Is the slirp library supported?
590 + case "$ac_cv_have_byte_bitfields" in
591 + yes|"guessing yes")
592 +  CAN_SLIRP=yes
593 +  ETHERSRC=ether_unix.cpp
594 +  ;;
595   esac
596 + if [[ -n "$CAN_SLIRP" ]]; then
597 +  AC_DEFINE(HAVE_SLIRP, 1, [Define if slirp library is supported])
598 +  SLIRP_SRCS="\
599 +    ../slirp/bootp.c     ../slirp/ip_output.c  ../slirp/tcp_input.c  \
600 +    ../slirp/cksum.c     ../slirp/mbuf.c       ../slirp/tcp_output.c \
601 +    ../slirp/debug.c     ../slirp/misc.c       ../slirp/tcp_subr.c   \
602 +    ../slirp/if.c        ../slirp/sbuf.c       ../slirp/tcp_timer.c  \
603 +    ../slirp/ip_icmp.c   ../slirp/slirp.c      ../slirp/tftp.c       \
604 +    ../slirp/ip_input.c  ../slirp/socket.c     ../slirp/udp.c"
605 + fi
606 + AC_SUBST(SLIRP_SRCS)
607  
608   dnl SDL overrides
609   if [[ "x$WANT_SDL" = "xyes" ]]; then
# Line 379 | Line 628 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
628    AUDIOSRC="../SDL/audio_sdl.cpp"
629   fi
630  
631 < SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
631 > SYSSRCS="$VIDEOSRCS $EXTFSSRC $PREFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
632  
633   dnl Define a macro that translates a yesno-variable into a C macro definition
634   dnl to be put into the config.h file
635   dnl $1 -- the macro to define
636   dnl $2 -- the value to translate
637   dnl $3 -- template name
638 < AC_DEFUN(AC_TRANSLATE_DEFINE, [
638 > AC_DEFUN([AC_TRANSLATE_DEFINE], [
639      if [[ "x$2" = "xyes" -o "x$2" = "xguessing yes" ]]; then
640          AC_DEFINE($1, 1, $3)
641      fi
# Line 683 | Line 932 | fi
932   AC_TRANSLATE_DEFINE(HAVE_MACH_EXCEPTIONS, "$ac_cv_have_mach_exceptions",
933    [Define if your system supports Mach exceptions.])
934  
935 + dnl Check if Windows exceptions are supported.
936 + AC_CACHE_CHECK([whether your system supports Windows exceptions],
937 +  ac_cv_have_win32_exceptions, [
938 +  AC_LANG_SAVE
939 +  AC_LANG_CPLUSPLUS
940 +  AC_TRY_RUN([
941 +    #define HAVE_WIN32_EXCEPTIONS 1
942 +    #define CONFIGURE_TEST_SIGSEGV_RECOVERY
943 +    #include "vm_alloc.cpp"
944 +    #include "sigsegv.cpp"
945 +  ], [
946 +  sigsegv_recovery=win32
947 +  ac_cv_have_win32_exceptions=yes
948 +  ],
949 +  ac_cv_have_win32_exceptions=no,
950 +  dnl When cross-compiling, do not assume anything.
951 +  ac_cv_have_win32_exceptions=no
952 +  )
953 +  AC_LANG_RESTORE
954 +  ]
955 + )
956 + AC_TRANSLATE_DEFINE(HAVE_WIN32_EXCEPTIONS, "$ac_cv_have_win32_exceptions",
957 +  [Define if your system supports Windows exceptions.])
958 +
959   dnl Otherwise, check if extended signals are supported.
960   if [[ -z "$sigsegv_recovery" ]]; then
961    AC_CACHE_CHECK([whether your system supports extended signal handlers],
# Line 821 | Line 1094 | int main(void)
1094                  memset(m, 0, ranges[[i]].size);
1095                  vm_release(m, ranges[[i]].size);
1096                  if (i == n_ranges - 1) {
1097 <                        printf("0x%08x\n", ofs);
1097 >                        if (sizeof(void *) == 8 && ofs > 0xffffffff)
1098 >                                printf("0x%lxul\n", ofs);
1099 >                        else
1100 >                                printf("0x%08x\n", ofs);
1101                          return 0;
1102                  }
1103          }
# Line 833 | Line 1109 | EOF
1109    doit='$CXX conftest.$ac_ext -o conftest.$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS $LIBS $NATMEM_OFFSET_DEF >& AS_MESSAGE_LOG_FD'
1110    if AC_TRY_EVAL(doit); then
1111      NATMEM_OFFSET=`./conftest.$ac_exeext`
1112 <    if [[ -z "$NATMEM_OFFSET" ]]; then
1113 <      AC_MSG_ERROR([could not determine a sensible NATMEM_OFFSET value])
838 <    else
839 <      WANT_ADDRESSING_MODE="direct,$NATMEM_OFFSET"
840 <    fi
1112 >  else
1113 >    NATMEM_OFFSET=
1114    fi
1115    rm -f conftest*
1116    AC_LANG_RESTORE
1117 +
1118 +  if [[ -z "$NATMEM_OFFSET" ]]; then
1119 +    AC_MSG_ERROR([could not determine a sensible NATMEM_OFFSET value])
1120 +  else
1121 +    WANT_ADDRESSING_MODE="direct,$NATMEM_OFFSET"
1122 +    AC_DEFINE_UNQUOTED(NATMEM_OFFSET, $NATMEM_OFFSET,
1123 +      [Define constant offset for Mac address translation])
1124 +  fi
1125   fi
1126   AC_MSG_RESULT($WANT_ADDRESSING_MODE)
1127  
1128 < if [[ -z "$NATMEM_OFFSET" ]]; then
1129 <  NATMEM_OFFSET=0
1128 > dnl Utility macro used by next two tests.
1129 > dnl AC_EXAMINE_OBJECT(C source code,
1130 > dnl     commands examining object file,
1131 > dnl     [commands to run if compile failed]):
1132 > dnl
1133 > dnl Compile the source code to an object file; then convert it into a
1134 > dnl printable representation.  All unprintable characters and
1135 > dnl asterisks (*) are replaced by dots (.).  All white space is
1136 > dnl deleted.  Newlines (ASCII 0x10) in the input are preserved in the
1137 > dnl output, but runs of newlines are compressed to a single newline.
1138 > dnl Finally, line breaks are forcibly inserted so that no line is
1139 > dnl longer than 80 columns and the file ends with a newline.  The
1140 > dnl result of all this processing is in the file conftest.dmp, which
1141 > dnl may be examined by the commands in the second argument.
1142 > dnl
1143 > AC_DEFUN([gcc_AC_EXAMINE_OBJECT],
1144 > [AC_LANG_SAVE
1145 > AC_LANG_C
1146 > dnl Next bit cribbed from AC_TRY_COMPILE.
1147 > cat > conftest.$ac_ext <<EOF
1148 > [#line __oline__ "configure"
1149 > #include "confdefs.h"
1150 > $1
1151 > ]EOF
1152 > if AC_TRY_EVAL(ac_compile); then
1153 >  od -c conftest.o |
1154 >    sed ['s/^[0-7]*[    ]*/ /
1155 >          s/\*/./g
1156 >          s/ \\n/*/g
1157 >          s/ [0-9][0-9][0-9]/./g
1158 >          s/  \\[^ ]/./g'] |
1159 >    tr -d '
1160 > ' | tr -s '*' '
1161 > ' | fold | sed '$a\
1162 > ' > conftest.dmp
1163 >  $2
1164 > ifelse($3, , , else
1165 >  $3
1166 > )dnl
1167 > fi
1168 > rm -rf conftest*
1169 > AC_LANG_RESTORE])
1170 >
1171 > dnl Floating point format probe.
1172 > dnl The basic concept is the same as the above: grep the object
1173 > dnl file for an interesting string.  We have to watch out for
1174 > dnl rounding changing the values in the object, however; this is
1175 > dnl handled by ignoring the least significant byte of the float.
1176 > dnl
1177 > dnl Does not know about VAX G-float or C4x idiosyncratic format.
1178 > dnl It does know about PDP-10 idiosyncratic format, but this is
1179 > dnl not presently supported by GCC.  S/390 "binary floating point"
1180 > dnl is in fact IEEE (but maybe we should have that in EBCDIC as well
1181 > dnl as ASCII?)
1182 > dnl
1183 > AC_DEFUN([gcc_AC_C_FLOAT_FORMAT],
1184 > [AC_CACHE_CHECK(floating point format, ac_cv_c_float_format,
1185 > [gcc_AC_EXAMINE_OBJECT(
1186 > [/* This will not work unless sizeof(double) == 8.  */
1187 > extern char sizeof_double_must_be_8 [sizeof(double) == 8 ? 1 : -1];
1188 >
1189 > /* This structure must have no internal padding.  */
1190 > struct possibility {
1191 >  char prefix[8];
1192 >  double candidate;
1193 >  char postfix[8];
1194 > };
1195 >
1196 > #define C(cand) { "\nformat:", cand, ":tamrof\n" }
1197 > struct possibility table [] =
1198 > {
1199 >  C( 3.25724264705901305206e+01), /* @@IEEEFP - IEEE 754 */
1200 >  C( 3.53802595280598432000e+18), /* D__float - VAX */
1201 >  C( 5.32201830133125317057e-19), /* D.PDP-10 - PDP-10 - the dot is 0x13a */
1202 >  C( 1.77977764695171661377e+10), /* IBMHEXFP - s/390 format, ascii */
1203 >  C(-5.22995989424860458374e+10)  /* IBMHEXFP - s/390 format, EBCDIC */
1204 > };],
1205 > [if   grep 'format:.@IEEEF.:tamrof' conftest.dmp >/dev/null 2>&1; then
1206 >    ac_cv_c_float_format='IEEE (big-endian)'
1207 >  elif grep 'format:.I@@PFE.:tamrof' conftest.dmp >/dev/null 2>&1; then
1208 >    ac_cv_c_float_format='IEEE (big-endian)'
1209 >  elif grep 'format:.FEEEI@.:tamrof' conftest.dmp >/dev/null 2>&1; then
1210 >    ac_cv_c_float_format='IEEE (little-endian)'
1211 >  elif grep 'format:.EFP@@I.:tamrof' conftest.dmp >/dev/null 2>&1; then
1212 >    ac_cv_c_float_format='IEEE (little-endian)'
1213 >  elif grep 'format:.__floa.:tamrof' conftest.dmp >/dev/null 2>&1; then
1214 >    ac_cv_c_float_format='VAX D-float'
1215 >  elif grep 'format:..PDP-1.:tamrof' conftest.dmp >/dev/null 2>&1; then
1216 >    ac_cv_c_float_format='PDP-10'
1217 >  elif grep 'format:.BMHEXF.:tamrof' conftest.dmp >/dev/null 2>&1; then
1218 >    ac_cv_c_float_format='IBM 370 hex'
1219 >  else
1220 >    AC_MSG_ERROR(Unknown floating point format)
1221 >  fi],
1222 >  [AC_MSG_ERROR(compile failed)])
1223 > ])
1224 > # IEEE is the default format.  If the float endianness isn't the same
1225 > # as the integer endianness, we have to set FLOAT_WORDS_BIG_ENDIAN
1226 > # (which is a tristate: yes, no, default).  This is only an issue with
1227 > # IEEE; the other formats are only supported by a few machines each,
1228 > # all with the same endianness.
1229 > format=IEEE_FLOAT_FORMAT
1230 > fbigend=
1231 > case $ac_cv_c_float_format in
1232 >    'IEEE (big-endian)' )
1233 >        if test $ac_cv_c_bigendian = no; then
1234 >            fbigend=1
1235 >        fi
1236 >        ;;
1237 >    'IEEE (little-endian)' )
1238 >        if test $ac_cv_c_bigendian = yes; then
1239 >            fbigend=0
1240 >        fi
1241 >        ;;
1242 >    'VAX D-float' )
1243 >        format=VAX_FLOAT_FORMAT
1244 >        ;;
1245 >    'PDP-10' )
1246 >        format=PDP10_FLOAT_FORMAT
1247 >        ;;
1248 >    'IBM 370 hex' )
1249 >        format=IBM_FLOAT_FORMAT
1250 >        ;;
1251 > esac
1252 > AC_DEFINE_UNQUOTED(HOST_FLOAT_FORMAT, $format,
1253 >  [Define to the floating point format of the host machine.])
1254 > if test -n "$fbigend"; then
1255 >        AC_DEFINE_UNQUOTED(HOST_FLOAT_WORDS_BIG_ENDIAN, $fbigend,
1256 >  [Define to 1 if the host machine stores floating point numbers in
1257 >   memory with the word containing the sign bit at the lowest address,
1258 >   or to 0 if it does it the other way around.
1259 >
1260 >   This macro should not be defined if the ordering is the same as for
1261 >   multi-word integers.])
1262   fi
1263 < AC_DEFINE_UNQUOTED(NATMEM_OFFSET, $NATMEM_OFFSET,
1264 <  [Define constant offset for Mac address translation])
1263 > ])
1264 >
1265 > dnl Check for host float format
1266 > gcc_AC_C_FLOAT_FORMAT
1267  
1268   dnl Platform specific binary postprocessor
1269   AC_PATH_PROG(BLESS, "true")
# Line 860 | Line 1275 | fi
1275   dnl Check for GCC 2.7 or higher.
1276   HAVE_GCC27=no
1277   AC_MSG_CHECKING(for GCC 2.7 or higher)
1278 < AC_EGREP_CPP(xyes,
1279 < [#if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5
1280 <  xyes
1281 < #endif
1282 < ], [AC_MSG_RESULT(yes); HAVE_GCC27=yes], AC_MSG_RESULT(no))
1278 > AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5)
1279 >                                     # error gcc < 2.7
1280 >                                     typedef syntax error;
1281 >                                     #endif
1282 >                                   ]])],
1283 >                  [AC_MSG_RESULT(yes); HAVE_GCC27=yes],
1284 >                  [AC_MSG_RESULT(no)])
1285  
1286   dnl Check for GCC 3.0 or higher.
1287   HAVE_GCC30=no
1288   AC_MSG_CHECKING(for GCC 3.0 or higher)
1289 < AC_EGREP_CPP(xyes,
1290 < [#if __GNUC__ >= 3
1291 <  xyes
1292 < #endif
1293 < ], [AC_MSG_RESULT(yes); HAVE_GCC30=yes], AC_MSG_RESULT(no))
1289 > AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ >= 3)
1290 >                                     # error gcc < 3
1291 >                                     typedef syntax error;
1292 >                                     #endif
1293 >                                   ]])],
1294 >                  [AC_MSG_RESULT(yes); HAVE_GCC30=yes],
1295 >                  [AC_MSG_RESULT(no)])
1296  
1297   dnl Check for ICC.
1298   AC_MSG_CHECKING(for ICC)
# Line 883 | Line 1302 | if $CXX -V -v 2>&1 | grep -q "Intel(R) C
1302   fi
1303   AC_MSG_RESULT($HAVE_ICC)
1304  
1305 < dnl Test if the compiler can generate ELF objects
1306 < AC_CACHE_CHECK([whether the compiler can generate ELF objects],
1307 <  ac_cv_elf_objects, [
1305 > dnl Determine the generated object format
1306 > AC_CACHE_CHECK([the format of compiler generated objects],
1307 >  ac_cv_object_format, [
1308    echo 'int i;' > conftest.$ac_ext
1309 <  ac_cv_elf_objects=no
1309 >  ac_cv_object_format=no
1310    if AC_TRY_EVAL(ac_compile); then
1311      case `/usr/bin/file conftest.$ac_objext` in
1312      *"ELF"*)
1313 <      ac_cv_elf_objects=yes
1313 >      ac_cv_object_format=elf
1314 >      ;;
1315 >    *"Mach-O"*)
1316 >      ac_cv_object_format=mach
1317 >      ;;
1318 >    *)
1319 >      ac_cv_object_format=unknown
1320        ;;
1321      esac
1322    fi
1323    rm -rf conftest*
1324   ])
1325 < ELF_OBJECTS=$ac_cv_elf_objects
1325 >
1326 > dnl Add -fno-strict-aliasing for slirp sources
1327 > if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1328 >  SAVED_CFLAGS="$CFLAGS"
1329 >  CFLAGS="$CFLAGS -fno-strict-aliasing"
1330 >  AC_CACHE_CHECK([whether the compiler supports -fno-strict-aliasing],
1331 >    ac_cv_gcc_no_strict_aliasing, [
1332 >    AC_TRY_COMPILE([],[],
1333 >      [ac_cv_gcc_no_strict_aliasing=yes; AC_SUBST(SLIRP_CFLAGS, "-fno-strict-aliasing")],
1334 >      [ac_cv_gcc_no_strict_aliasing=no])
1335 >  ])
1336 >  CFLAGS="$SAVED_CFLAGS"
1337 > fi
1338 >
1339 > dnl Add -mdynamic-no-pic for MacOS X (XXX icc10 will support MacOS X)
1340 > if [[ "x$HAVE_GCC30" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
1341 >  SAVED_CFLAGS="$CFLAGS"
1342 >  CFLAGS="$CFLAGS -mdynamic-no-pic"
1343 >  AC_CACHE_CHECK([whether the compiler supports -mdynamic-no-pic],
1344 >    ac_cv_gcc_mdynamic_no_pic, [
1345 >    AC_TRY_COMPILE([],[],[ac_cv_gcc_mdynamic_no_pic=yes],[ac_cv_gcc_mdynamic_no_pic=no])
1346 >  ])
1347 >  if [[ "x$ac_cv_gcc_mdynamic_no_pic" = "xyes" ]]; then
1348 >    CXXFLAGS="$CXXFLAGS -mdynamic-no-pic"
1349 >  else
1350 >    CFLAGS="$SAVED_CFLAGS"
1351 >  fi
1352 > fi
1353  
1354   dnl CPU emulator sources
1355   if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1356    CPUSRCS="\
1357 +    ../kpx_cpu/src/mathlib/ieeefp.cpp \
1358 +    ../kpx_cpu/src/mathlib/mathlib.cpp \
1359      ../kpx_cpu/src/cpu/ppc/ppc-cpu.cpp \
1360      ../kpx_cpu/src/cpu/ppc/ppc-decode.cpp \
1361      ../kpx_cpu/src/cpu/ppc/ppc-execute.cpp \
1362 <    ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp"
1362 >    ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp \
1363 >    ../kpx_cpu/src/utils/utils-cpuinfo.cpp"
1364    CPPFLAGS="$CPPFLAGS -I../kpx_cpu/include -I../kpx_cpu/src"
1365  
1366    dnl Enable JIT compiler, if possible
1367    if [[ "x$WANT_JIT" = "xyes" ]]; then
1368      AC_CACHE_CHECK([whether dyngen can be used],
1369        ac_cv_use_dyngen, [
1370 <      case $host_cpu:$ELF_OBJECTS in
1371 <      powerpc:yes)
1370 >      case $host_cpu:$ac_cv_object_format in
1371 >      powerpc:elf)
1372 >        ac_cv_use_dyngen=yes
1373 >        ;;
1374 >      x86_64:elf)
1375 >        ac_cv_use_dyngen=yes
1376 >        ;;
1377 >      i?86:elf)
1378 >        ac_cv_use_dyngen=yes
1379 >        ;;
1380 >      mips:elf)
1381          ac_cv_use_dyngen=yes
1382          ;;
1383 <      x86_64:yes)
1383 >      powerpc:mach)
1384          ac_cv_use_dyngen=yes
1385          ;;
1386 <      i?86:yes)
1386 >      i?86:mach)
1387          ac_cv_use_dyngen=yes
1388          ;;
1389        *:*)
# Line 931 | Line 1395 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1395          if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
1396            DYNGEN_CC=$CXX
1397          else
1398 <          for p in /usr/bin /usr/local/bin; do
1398 >          for p in /usr/bin /usr/local/bin /usr/freeware/bin; do
1399              gxx="$p/g++"
1400              if [[ -x "$gxx" ]]; then
1401                DYNGEN_CC="$gxx"
# Line 939 | Line 1403 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1403            done
1404          fi
1405        fi
1406 <      if [[ -z "$DYNGEN_CC" ]] || ! { echo '#include <limits>' | $DYNGEN_CC -xc++ -c -o /dev/null - >& /dev/null; }; then
1406 >      if [[ -z "$DYNGEN_CC" ]]; then
1407          ac_cv_use_dyngen=no
1408        fi
1409      ])
1410      if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then
1411        case $host_cpu in
1412        i?86)
1413 <        DYNGEN_OP_FLAGS="-fomit-frame-pointer -mpreferred-stack-boundary=2"
950 <        if [[ "x$HAVE_GCC30" = "xyes" ]]; then
951 <          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -falign-functions=0"
952 <        else
953 <          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
954 <        fi
955 <        saved_CPPFLAGS=$CPPFLAGS
956 <        CPPFLAGS="$CPPFLAGS -mmmx"
957 <        AC_CHECK_HEADERS(mmintrin.h,  [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -mmmx"])
958 <        CPPFLAGS="$CPPFLAGS -msse"
959 <        AC_CHECK_HEADERS(xmmintrin.h, [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -msse"])
960 <        CPPFLAGS="$CPPFLAGS -msse2"
961 <        AC_CHECK_HEADERS(emmintrin.h, [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -msse2"])
962 <        CPPFLAGS=$saved_CPPFLAGS
1413 >        DYNGEN_OP_FLAGS="-fomit-frame-pointer"
1414          ;;
1415 <      x86_64)
1416 <        AC_CHECK_HEADERS(mmintrin.h xmmintrin.h emmintrin.h)
1415 >      mips)
1416 >        DYNGEN_OP_FLAGS="-fno-delayed-branch -mno-abicalls"
1417 >        ;;
1418 >      powerpc)
1419 >        if [[ "x$ac_cv_object_format" = "xmach" ]]; then
1420 >          DYNGEN_OP_FLAGS="-mdynamic-no-pic"
1421 >        fi
1422          ;;
1423        esac
1424 <      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-limit=10000"
1425 <      if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1424 >      have_dyngen_gcc3=no
1425 >      case "x`$DYNGEN_CC -dumpversion`" in
1426 >      x[12].*) ;;
1427 >      x*) have_dyngen_gcc3=yes ;;
1428 >      esac
1429 >      if [[ "x$have_dyngen_gcc3" = "xyes" ]]; then
1430 >        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-align-functions"
1431 >      else
1432 >        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
1433 >      fi
1434 >      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-functions -finline-limit=10000 -fno-exceptions -g0"
1435 >      if [[ "x$have_dyngen_gcc3" = "xyes" ]]; then
1436          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-reorder-blocks -fno-optimize-sibling-calls"
1437        fi
1438 +      if [[ "x$DYNGEN_CC" != "x$CXX" ]]; then
1439 +        DYNGEN_CFLAGS="-O2 $CFLAGS"
1440 +        DYNGEN_CXXFLAGS="-O2 $CXXFLAGS"
1441 +      else
1442 +        DYNGEN_CFLAGS="\$(CFLAGS)"
1443 +        DYNGEN_CXXFLAGS="\$(CXXFLAGS)"
1444 +      fi
1445      else
1446        WANT_JIT=no
1447      fi
# Line 980 | Line 1453 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1453        CPUSRCS="\
1454          ../kpx_cpu/src/cpu/jit/jit-cache.cpp \
1455          ../kpx_cpu/src/cpu/jit/basic-dyngen.cpp \
1456 <        ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp $CPUSRCS"
1456 >        ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp \
1457 >        ../kpx_cpu/src/cpu/ppc/ppc-jit.cpp $CPUSRCS"
1458      fi
1459    fi
1460    CPUSRCS="$CPUSRCS ../kpx_cpu/sheepshaver_glue.cpp"
1461   else
1462    WANT_JIT=no
1463   fi
990 if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then
991  AC_CACHE_CHECK([whether static data regions are executable],
992    ac_cv_have_static_data_exec, [
993    AC_TRY_RUN([int main(void) {
994 #if defined(__powerpc__)
995      static unsigned int p[8] = {0x4e800020,};
996      asm volatile("dcbst 0,%0" : : "r" (p) : "memory");
997      asm volatile("sync" : : : "memory");
998      asm volatile("icbi 0,%0" : : "r" (p) : "memory");
999      asm volatile("sync" : : : "memory");
1000      asm volatile("isync" : : : "memory");
1001      ((void (*)(void))p)();
1002      return 0;
1003 #endif
1004      return 1;
1005    }], ac_cv_have_static_data_exec=yes, ac_cv_have_static_data_exec=no,
1006    dnl When cross-compiling, do not assume anything.
1007    ac_cv_have_static_data_exec=no
1008    )
1009  ])
1010 fi
1011 AC_TRANSLATE_DEFINE(HAVE_STATIC_DATA_EXEC, "$ac_cv_have_static_data_exec",
1012  [Define if your system marks static data pages as executable.])
1013
1464   if [[ "x$WANT_JIT" = "xyes" ]]; then
1465    CPPFLAGS="$CPPFLAGS -DUSE_JIT"
1466   fi
1467  
1468 + dnl Higher level optimizations with MIPSPro compilers are possible
1469 + if [[ "x$HAVE_IPA" = "xyes" ]]; then
1470 +  CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'` -O3 -OPT:Olimit=0 -IPA"
1471 +  CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-g//g'` -O3 -OPT:Olimit=0 -IPA"
1472 +  CXXFLAGS="-LANG:std $CXXFLAGS"
1473 +  LDFLAGS="$LDFLAGS -O3 -OPT:Olimit=0 -IPA"
1474 + fi
1475 +
1476 + dnl Check for linker script support
1477 + case $target_os:$target_cpu in
1478 + linux*:i?86)    LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1479 + linux*:x86_64)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-x86_64.ld";;
1480 + linux*:powerpc) LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-ppc.ld";;
1481 + netbsd*:i?86)   LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1482 + freebsd*:i?86)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/freebsd-i386.ld";;
1483 + darwin*:*)      LINKER_SCRIPT_FLAGS="-Wl,-seg1addr,0x78048000";;
1484 + esac
1485 + if [[ -n "$LINKER_SCRIPT_FLAGS" ]]; then
1486 +  AC_CACHE_CHECK([whether linker script is usable],
1487 +    ac_cv_linker_script_works, [
1488 +    AC_LANG_SAVE
1489 +    AC_LANG_CPLUSPLUS
1490 +    saved_LDFLAGS="$LDFLAGS"
1491 +    LDFLAGS="$LDFLAGS $LINKER_SCRIPT_FLAGS"
1492 +    AC_TRY_RUN(
1493 +      [int main() {if ((char *)&main < (char *)0x70000000) return 1;}],
1494 +      [ac_cv_linker_script_works=yes],
1495 +      [ac_cv_linker_script_works=no],
1496 +      dnl When cross-compiling, assume it works
1497 +      [ac_cv_linker_script_works="guessing yes"]
1498 +    )
1499 +    AC_LANG_RESTORE
1500 +    if [[ "$ac_cv_linker_script_works" = "no" ]]; then
1501 +      LDFLAGS="$saved_LDFLAGS"
1502 +      LINKER_SCRIPT_FLAGS=""
1503 +    fi
1504 +  ])
1505 + fi
1506 + AC_TRANSLATE_DEFINE(HAVE_LINKER_SCRIPT, "$ac_cv_linker_script_works",
1507 +  [Define if there is a linker script to relocate the executable above 0x70000000.])
1508 +
1509   dnl Generate Makefile.
1510 + AC_SUBST(PERL)
1511 + AC_SUBST(USE_DYNGEN, [$ac_cv_use_dyngen])
1512   AC_SUBST(DYNGENSRCS)
1513   AC_SUBST(DYNGEN_CC)
1514 + AC_SUBST(DYNGEN_CFLAGS)
1515 + AC_SUBST(DYNGEN_CXXFLAGS)
1516   AC_SUBST(DYNGEN_OP_FLAGS)
1517   AC_SUBST(SYSSRCS)
1518   AC_SUBST(CPUSRCS)
# Line 1033 | Line 1528 | echo
1528   echo SheepShaver configuration summary:
1529   echo
1530   echo SDL support ...................... : $SDL_SUPPORT
1531 + echo FBDev DGA support ................ : $WANT_FBDEV_DGA
1532   echo XFree86 DGA support .............. : $WANT_XF86_DGA
1533   echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
1534   echo Using PowerPC emulator ........... : $EMULATED_PPC

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines