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.44 by gbeauche, 2005-12-12T21:22:40Z

# 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_WITH(esd,            [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
32 < AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
32 > AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]],
33 >  [case "$withval" in
34 >   gtk1)      WANT_GTK="gtk";;
35 >   gtk|gtk2)  WANT_GTK="$withval";;
36 >   yes)       WANT_GTK="gtk2 gtk";;
37 >   *)         WANT_GTK="no";;
38 >   esac],
39 >  [WANT_GTK="gtk2 gtk"])
40   AC_ARG_WITH(mon,            [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
41   AC_ARG_WITH(dgcc,           [  --with-dgcc=COMPILER    use C++ COMPILER to compile synthetic opcodes], [DYNGEN_CC=$withval])
42  
# Line 31 | Line 46 | AC_ARG_ENABLE(addressing,
46    [case "$enableval" in
47     real)        WANT_ADDRESSING_MODE="real";;
48     direct)      WANT_ADDRESSING_MODE="direct";;
49 <   direct,0x*)  WANT_ADDRESSING_MODE="direct"; NATMEM_OFFSET=`echo "$enableval" | sed -n '/direct,\(0[[xX]][[0-9A-Fa-f]]*\)/s//\1/p'`;;
49 >   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'`;;
50     esac],
51    [WANT_ADDRESSING_MODE="real"]
52   )
# Line 48 | Line 63 | AC_PROG_CXX
63   AC_PROG_MAKE_SET
64   AC_PROG_INSTALL
65   AC_PROG_EGREP
66 + AC_PATH_PROGS(FILE, [file false])
67 + AC_PATH_PROG(PERL, [perl])
68  
69   dnl Check for PowerPC target CPU.
70   HAVE_PPC=no
# Line 104 | Line 121 | if [[ "x$WANT_MON" = "xyes" ]]; then
121      WANT_MON=no
122    fi
123   fi
124 + AC_SUBST(MONSRCS)
125  
126   dnl Checks for libraries.
127   AC_CHECK_LIB(posix4, sem_init)
128 + AC_CHECK_LIB(m, cos)
129  
130   dnl Do we need SDL?
131   WANT_SDL=no
# Line 135 | Line 154 | if [[ "x$WANT_SDL" = "xyes" ]]; then
154      LIBS="$LIBS $sdl_libs"
155    else
156      WANT_SDL=no
157 +    WANT_SDL_VIDEO=no
158 +    WANT_SDL_AUDIO=no
159    fi
160    SDL_SUPPORT=`echo "$SDL_SUPPORT" | sed -e "s/^ //"`
161   else
# Line 142 | Line 163 | else
163   fi
164  
165   dnl We need X11, if not using SDL.
166 < if [[ "x$WANT_SDL" = "xno" ]]; then
166 > if [[ "x$WANT_SDL_VIDEO" != "xyes" ]]; then
167    AC_PATH_XTRA
168    if [[ "x$no_x" = "xyes" ]]; then
169      AC_MSG_ERROR([You need X11 to run SheepShaver.])
# Line 155 | Line 176 | fi
176   dnl We need pthreads on non-PowerPC systems. Try libpthread first, then libc_r (FreeBSD), then PTL.
177   HAVE_PTHREADS=yes
178   case $EMULATED_PPC:$target_os in
179 < no:linux*)
179 > no:linux*|no:netbsd*)
180    dnl We do have our own pthread_cancel() implementation
181    AC_DEFINE(HAVE_PTHREAD_CANCEL, 1, [Define if you have the pthread_cancel function.])
182    ;;
# Line 163 | Line 184 | no:linux*)
184    AC_CHECK_LIB(pthread, pthread_create, , [
185      AC_CHECK_LIB(c_r, pthread_create, , [
186        AC_CHECK_LIB(PTL, pthread_create, , [
187 <        AC_MSG_ERROR([You need pthreads to run Basilisk II.])
187 >        dnl XXX remove when no pthreads case is merged
188 >        AC_MSG_ERROR([You need pthreads to run SheepShaver.])
189 >        HAVE_PTHREADS=no
190        ])
191      ])
192    ])
193    AC_CHECK_FUNCS(pthread_cancel)
194 +  AC_CHECK_FUNCS(pthread_cond_init pthread_testcancel)
195    AC_CHECK_FUNCS(pthread_mutexattr_setprotocol)
196    AC_CHECK_FUNCS(pthread_mutexattr_settype)
197    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
198    dnl If POSIX.4 semaphores are not available, we emulate them with pthread mutexes.
199    SEMSRC=
200    AC_CHECK_FUNCS(sem_init, , [
# Line 183 | Line 204 | no:linux*)
204    ])
205    ;;
206   esac
207 + if [[ "x$HAVE_PTHREADS" = "xyes" ]]; then
208 +  AC_DEFINE(HAVE_PTHREADS, 1, [Define if pthreads are available.])
209 + fi
210 +
211 + dnl We use FBDev DGA if possible.
212 + if [[ "x$WANT_FBDEV_DGA" = "xyes" ]]; then
213 +  AC_CHECK_HEADER(linux/fb.h, [
214 +    AC_DEFINE(ENABLE_FBDEV_DGA, 1, [Define if using Linux fbdev extension.])
215 +  ], [
216 +    AC_MSG_WARN([Could not find Linux FBDev extension, ignoring --enable-fbdev-dga.])
217 +    WANT_FBDEV_DGA=no
218 +  ])
219 + fi
220  
221   dnl We use XFree86 DGA if possible.
222   if [[ "x$WANT_XF86_DGA" = "xyes" ]]; then
# Line 208 | Line 242 | fi
242  
243   dnl We use GTK+ if possible.
244   UISRCS=../dummy/prefs_editor_dummy.cpp
245 < if [[ "x$WANT_GTK" = "xyes" ]]; then
245 > case "x$WANT_GTK" in
246 > xgtk2*)
247 >  AM_PATH_GTK_2_0(1.3.15, [
248 >    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
249 >    CFLAGS="$CFLAGS $GTK_CFLAGS"
250 >    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
251 >    LIBS="$LIBS $GTK_LIBS"
252 >    UISRCS=prefs_editor_gtk.cpp
253 >    WANT_GTK=gtk2
254 >  ], [
255 >    case "x${WANT_GTK}x" in
256 >    *gtkx)
257 >      AC_MSG_WARN([Could not find GTK+ 2.0, trying with GTK+ 1.2.])
258 >      WANT_GTK=gtk
259 >      ;;
260 >    *)
261 >      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
262 >      WANT_GTK=no
263 >      ;;
264 >    esac
265 >  ])
266 >  ;;
267 > esac
268 > if [[ "x$WANT_GTK" = "xgtk" ]]; then
269    AM_PATH_GTK(1.2.0, [
270      AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
271      CFLAGS="$CFLAGS $GTK_CFLAGS"
# Line 240 | Line 297 | AC_SYS_LARGEFILE
297   dnl Checks for header files.
298   AC_HEADER_STDC
299   AC_HEADER_SYS_WAIT
300 + AC_CHECK_HEADERS(malloc.h stdint.h)
301   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)
302   AC_CHECK_HEADERS(unistd.h fcntl.h byteswap.h dirent.h)
303 < AC_CHECK_HEADERS(linux/if.h, [], [], [
304 < #if HAVE_SYS_SOCKET_H
305 < # include <sys/socket.h>
303 > AC_CHECK_HEADERS(sys/socket.h sys/ioctl.h sys/filio.h sys/bitypes.h sys/wait.h)
304 > AC_CHECK_HEADERS(sys/time.h sys/poll.h sys/select.h arpa/inet.h)
305 > AC_CHECK_HEADERS(linux/if.h linux/if_tun.h net/if.h net/if_tun.h, [], [], [
306 > #ifdef HAVE_SYS_TYPES_H
307 > #include <sys/types.h>
308 > #endif
309 > #ifdef HAVE_SYS_SOCKET_H
310 > #include <sys/socket.h>
311   #endif
312   ])
313 < AC_CHECK_HEADERS(linux/if_tun.h net/if.h net/if_tun.h)
313 > AC_CHECK_HEADERS(AvailabilityMacros.h)
314 > AC_CHECK_HEADERS(IOKit/storage/IOBlockStorageDevice.h)
315 > AC_CHECK_HEADERS(fenv.h)
316  
317   dnl Checks for typedefs, structures, and compiler characteristics.
318   AC_C_BIGENDIAN
# Line 268 | Line 332 | AC_TYPE_SIGNAL
332   AC_HEADER_TIME
333   AC_STRUCT_TM
334  
335 + dnl Check whether sys/socket.h defines type socklen_t.
336 + dnl (extracted from ac-archive/Miscellaneous)
337 + AC_CACHE_CHECK([for socklen_t],
338 +  ac_cv_type_socklen_t, [
339 +  AC_TRY_COMPILE([
340 +    #include <sys/types.h>
341 +    #include <sys/socket.h>
342 +  ], [socklen_t len = 42; return 0;],
343 +  ac_cv_type_socklen_t=yes, ac_cv_type_socklen_t=no,
344 +  dnl When cross-compiling, do not assume anything.
345 +  ac_cv_type_socklen_t="guessing no"
346 +  )
347 + ])
348 + if [[ "x$ac_cv_type_socklen_t" != "xyes" ]]; then
349 +  AC_DEFINE(socklen_t, int, [Define to 'int' if <sys/types.h> doesn't define.])
350 + fi
351 +
352   dnl Check whether struct sigaction has sa_restorer member.
353   AC_CACHE_CHECK([whether struct sigaction has sa_restorer],
354    ac_cv_signal_sa_restorer, [
# Line 284 | Line 365 | if [[ "x$ac_cv_signal_sa_restorer" = "xy
365   fi
366  
367   dnl Checks for library functions.
368 < AC_CHECK_FUNCS(strdup strlcpy cfmakeraw)
368 > AC_CHECK_FUNCS(strdup strerror strlcpy cfmakeraw)
369   AC_CHECK_FUNCS(nanosleep)
370   AC_CHECK_FUNCS(sigaction signal)
371   AC_CHECK_FUNCS(mmap mprotect munmap)
372   AC_CHECK_FUNCS(vm_allocate vm_deallocate vm_protect)
373 < AC_CHECK_FUNCS(posix_memalign memalign valloc)
373 > AC_CHECK_FUNCS(exp2f log2f exp2 log2)
374 > AC_CHECK_FUNCS(floorf roundf ceilf truncf floor round ceil trunc)
375 > AC_CHECK_FUNCS(poll inet_aton)
376  
377   dnl Darwin seems to define mach_task_self() instead of task_self().
378   AC_CHECK_FUNCS(mach_task_self task_self)
# Line 301 | Line 384 | no:linux*)
384    ;;
385   *:*)
386    AC_SEARCH_LIBS(clock_gettime, [rt posix4])
387 <  AC_CHECK_FUNCS(clock_gettime)
387 >  AC_CHECK_FUNCS(clock_gettime clock_nanosleep)
388    ;;
389   esac
390  
391 + dnl Check for headers and functions related to pty support (sshpty.c)
392 + dnl From openssh-3.2.2p1 configure.ac
393 + AC_CHECK_HEADERS(strings.h login.h sys/bsdtty.h sys/stat.h util.h pty.h)
394 + AC_CHECK_FUNCS(_getpty vhangup strlcpy)
395 +
396 + case "$host" in
397 + *-*-hpux10.26)
398 +        disable_ptmx_check=yes
399 +        ;;
400 + *-*-linux*)
401 +        no_dev_ptmx=1
402 +        ;;
403 + mips-sony-bsd|mips-sony-newsos4)
404 +        AC_DEFINE(HAVE_NEWS4, 1, [Define if you are on NEWS-OS (additions from openssh-3.2.2p1, for sshpty.c).])
405 +        ;;
406 + *-*-sco3.2v4*)
407 +        no_dev_ptmx=1
408 +        ;;
409 + *-*-sco3.2v5*)
410 +        no_dev_ptmx=1
411 +        ;;
412 + *-*-cygwin*)
413 +        no_dev_ptmx=1
414 +        ;;
415 + esac
416 +
417 + if test -z "$no_dev_ptmx" ; then
418 +        if test "x$disable_ptmx_check" != "xyes" ; then
419 +                AC_CHECK_FILE([/dev/ptmx],
420 +                        [
421 +                                AC_DEFINE_UNQUOTED(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx.])
422 +                                have_dev_ptmx=1
423 +                        ]
424 +                )
425 +        fi
426 + fi
427 + AC_CHECK_FILE([/dev/ptc],
428 +        [
429 +                AC_DEFINE_UNQUOTED(HAVE_DEV_PTS_AND_PTC, 1, [Define if you have /dev/ptc.])
430 +                have_dev_ptc=1
431 +        ]
432 + )
433 + dnl (end of code from openssh-3.2.2p1 configure.ac)
434 +
435   dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES)
436   AC_DEFUN(AC_CHECK_FRAMEWORK, [
437    AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])dnl
# Line 326 | Line 453 | AC_DEFUN(AC_CHECK_FRAMEWORK, [
453   dnl Check for some MacOS X frameworks
454   AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
455   AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
456 + AC_CHECK_FRAMEWORK(CoreFoundation, [#include <CoreFoundation/CoreFoundation.h>])
457  
458   dnl Select system-dependant sources.
459   SERIALSRC=serial_unix.cpp
# Line 336 | Line 464 | EXTFSSRC=extfs_unix.cpp
464   EXTRASYSSRCS=
465   case "$target_os" in
466   linux*)
467 <  ETHERSRC=Linux/ether_linux.cpp
467 >  ETHERSRC=ether_unix.cpp
468    AUDIOSRC=audio_oss_esd.cpp
469    SCSISRC=Linux/scsi_linux.cpp
470    if [[ "x$EMULATED_PPC" = "xno" ]]; then
471 <    EXTRASYSSRCS="Linux/paranoia.cpp Linux/sheepthreads.c Linux/asm_linux.S"
471 >    EXTRASYSSRCS="paranoia.cpp Linux/sheepthreads.c ppc_asm.S"
472 >  fi
473 >  ;;
474 > freebsd*)
475 >  ETHERSRC=ether_unix.cpp
476 >  ;;
477 > netbsd*)
478 >  ETHERSRC=ether_unix.cpp
479 >  if [[ "x$EMULATED_PPC" = "xno" ]]; then
480 >    EXTRASYSSRCS="paranoia.cpp NetBSD/sheepthreads.c ppc_asm.S"
481    fi
482    ;;
483   darwin*)
484 +  ETHERSRC=ether_unix.cpp
485    if [[ "x$EMULATED_PPC" = "xno" ]]; then
486 <    EXTRASYSSRCS="Darwin/paranoia.cpp Linux/asm_linux.S"
486 >    EXTRASYSSRCS="paranoia.cpp ppc_asm.S"
487    fi
488 <  if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
488 >  if [[ "x$ac_cv_framework_IOKit" = "xyes" -a "x$ac_cv_framework_CoreFoundation" = "xyes" ]]; then
489      EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
490    fi
491    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
492      EXTFSSRC=../MacOSX/extfs_macosx.mm
493    fi
494    ;;
495 + irix*)
496 +  ETHERSRC=ether_unix.cpp
497 +  AUDIOSRC=Irix/audio_irix.cpp
498 +  LIBS="$LIBS -laudio"
499 +  WANT_ESD=no
500 +
501 +  dnl Check if our compiler supports -IPA (MIPSPro)
502 +  HAVE_IPA=no
503 +  ocflags="$CFLAGS"
504 +  CFLAGS=`echo " $CFLAGS -IPA" | sed -e "s/ -g //g"`
505 +  AC_MSG_CHECKING(if "-IPA" works)
506 +  dnl Do a test compile of an empty function
507 +  AC_TRY_COMPILE([#if defined __GNUC__
508 +                  # error GCC does not support IPA yet
509 +                  #endif],, [AC_MSG_RESULT(yes); HAVE_IPA=yes], AC_MSG_RESULT(no))
510 +  CFLAGS="$ocflags"
511 +  ;;
512   esac
513  
514 + dnl Is the slirp library supported?
515 + if [[ "x$ETHERSRC" = "xether_unix.cpp" ]]; then
516 +  AC_DEFINE(HAVE_SLIRP, 1, [Define if slirp library is supported])
517 +  SLIRP_SRCS="\
518 +    ../slirp/bootp.c     ../slirp/ip_output.c  ../slirp/tcp_input.c  \
519 +    ../slirp/cksum.c     ../slirp/mbuf.c       ../slirp/tcp_output.c \
520 +    ../slirp/debug.c     ../slirp/misc.c       ../slirp/tcp_subr.c   \
521 +    ../slirp/if.c        ../slirp/sbuf.c       ../slirp/tcp_timer.c  \
522 +    ../slirp/ip_icmp.c   ../slirp/slirp.c      ../slirp/tftp.c       \
523 +    ../slirp/ip_input.c  ../slirp/socket.c     ../slirp/udp.c"
524 + fi
525 + AC_SUBST(SLIRP_SRCS)
526 +
527   dnl SDL overrides
528   if [[ "x$WANT_SDL" = "xyes" ]]; then
529    AC_DEFINE(USE_SDL, 1, [Define to enble SDL support.])
# Line 379 | Line 547 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
547    AUDIOSRC="../SDL/audio_sdl.cpp"
548   fi
549  
550 < SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
550 > SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
551  
552   dnl Define a macro that translates a yesno-variable into a C macro definition
553   dnl to be put into the config.h file
# Line 683 | Line 851 | fi
851   AC_TRANSLATE_DEFINE(HAVE_MACH_EXCEPTIONS, "$ac_cv_have_mach_exceptions",
852    [Define if your system supports Mach exceptions.])
853  
854 + dnl Check if Windows exceptions are supported.
855 + AC_CACHE_CHECK([whether your system supports Windows exceptions],
856 +  ac_cv_have_win32_exceptions, [
857 +  AC_LANG_SAVE
858 +  AC_LANG_CPLUSPLUS
859 +  AC_TRY_RUN([
860 +    #define HAVE_WIN32_EXCEPTIONS 1
861 +    #define CONFIGURE_TEST_SIGSEGV_RECOVERY
862 +    #include "vm_alloc.cpp"
863 +    #include "sigsegv.cpp"
864 +  ], [
865 +  sigsegv_recovery=win32
866 +  ac_cv_have_win32_exceptions=yes
867 +  ],
868 +  ac_cv_have_win32_exceptions=no,
869 +  dnl When cross-compiling, do not assume anything.
870 +  ac_cv_have_win32_exceptions=no
871 +  )
872 +  AC_LANG_RESTORE
873 +  ]
874 + )
875 + AC_TRANSLATE_DEFINE(HAVE_WIN32_EXCEPTIONS, "$ac_cv_have_win32_exceptions",
876 +  [Define if your system supports Windows exceptions.])
877 +
878   dnl Otherwise, check if extended signals are supported.
879   if [[ -z "$sigsegv_recovery" ]]; then
880    AC_CACHE_CHECK([whether your system supports extended signal handlers],
# Line 821 | Line 1013 | int main(void)
1013                  memset(m, 0, ranges[[i]].size);
1014                  vm_release(m, ranges[[i]].size);
1015                  if (i == n_ranges - 1) {
1016 <                        printf("0x%08x\n", ofs);
1016 >                        if (sizeof(void *) == 8 && ofs > 0xffffffff)
1017 >                                printf("0x%lxul\n", ofs);
1018 >                        else
1019 >                                printf("0x%08x\n", ofs);
1020                          return 0;
1021                  }
1022          }
# Line 833 | Line 1028 | EOF
1028    doit='$CXX conftest.$ac_ext -o conftest.$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS $LIBS $NATMEM_OFFSET_DEF >& AS_MESSAGE_LOG_FD'
1029    if AC_TRY_EVAL(doit); then
1030      NATMEM_OFFSET=`./conftest.$ac_exeext`
1031 <    if [[ -z "$NATMEM_OFFSET" ]]; then
1032 <      AC_MSG_ERROR([could not determine a sensible NATMEM_OFFSET value])
838 <    else
839 <      WANT_ADDRESSING_MODE="direct,$NATMEM_OFFSET"
840 <    fi
1031 >  else
1032 >    NATMEM_OFFSET=
1033    fi
1034    rm -f conftest*
1035    AC_LANG_RESTORE
1036 +
1037 +  if [[ -z "$NATMEM_OFFSET" ]]; then
1038 +    AC_MSG_ERROR([could not determine a sensible NATMEM_OFFSET value])
1039 +  else
1040 +    WANT_ADDRESSING_MODE="direct,$NATMEM_OFFSET"
1041 +    AC_DEFINE_UNQUOTED(NATMEM_OFFSET, $NATMEM_OFFSET,
1042 +      [Define constant offset for Mac address translation])
1043 +  fi
1044   fi
1045   AC_MSG_RESULT($WANT_ADDRESSING_MODE)
1046  
1047 < if [[ -z "$NATMEM_OFFSET" ]]; then
1048 <  NATMEM_OFFSET=0
1047 > dnl Utility macro used by next two tests.
1048 > dnl AC_EXAMINE_OBJECT(C source code,
1049 > dnl     commands examining object file,
1050 > dnl     [commands to run if compile failed]):
1051 > dnl
1052 > dnl Compile the source code to an object file; then convert it into a
1053 > dnl printable representation.  All unprintable characters and
1054 > dnl asterisks (*) are replaced by dots (.).  All white space is
1055 > dnl deleted.  Newlines (ASCII 0x10) in the input are preserved in the
1056 > dnl output, but runs of newlines are compressed to a single newline.
1057 > dnl Finally, line breaks are forcibly inserted so that no line is
1058 > dnl longer than 80 columns and the file ends with a newline.  The
1059 > dnl result of all this processing is in the file conftest.dmp, which
1060 > dnl may be examined by the commands in the second argument.
1061 > dnl
1062 > AC_DEFUN([gcc_AC_EXAMINE_OBJECT],
1063 > [AC_LANG_SAVE
1064 > AC_LANG_C
1065 > dnl Next bit cribbed from AC_TRY_COMPILE.
1066 > cat > conftest.$ac_ext <<EOF
1067 > [#line __oline__ "configure"
1068 > #include "confdefs.h"
1069 > $1
1070 > ]EOF
1071 > if AC_TRY_EVAL(ac_compile); then
1072 >  od -c conftest.o |
1073 >    sed ['s/^[0-7]*[    ]*/ /
1074 >          s/\*/./g
1075 >          s/ \\n/*/g
1076 >          s/ [0-9][0-9][0-9]/./g
1077 >          s/  \\[^ ]/./g'] |
1078 >    tr -d '
1079 > ' | tr -s '*' '
1080 > ' | fold | sed '$a\
1081 > ' > conftest.dmp
1082 >  $2
1083 > ifelse($3, , , else
1084 >  $3
1085 > )dnl
1086 > fi
1087 > rm -rf conftest*
1088 > AC_LANG_RESTORE])
1089 >
1090 > dnl Floating point format probe.
1091 > dnl The basic concept is the same as the above: grep the object
1092 > dnl file for an interesting string.  We have to watch out for
1093 > dnl rounding changing the values in the object, however; this is
1094 > dnl handled by ignoring the least significant byte of the float.
1095 > dnl
1096 > dnl Does not know about VAX G-float or C4x idiosyncratic format.
1097 > dnl It does know about PDP-10 idiosyncratic format, but this is
1098 > dnl not presently supported by GCC.  S/390 "binary floating point"
1099 > dnl is in fact IEEE (but maybe we should have that in EBCDIC as well
1100 > dnl as ASCII?)
1101 > dnl
1102 > AC_DEFUN([gcc_AC_C_FLOAT_FORMAT],
1103 > [AC_CACHE_CHECK(floating point format, ac_cv_c_float_format,
1104 > [gcc_AC_EXAMINE_OBJECT(
1105 > [/* This will not work unless sizeof(double) == 8.  */
1106 > extern char sizeof_double_must_be_8 [sizeof(double) == 8 ? 1 : -1];
1107 >
1108 > /* This structure must have no internal padding.  */
1109 > struct possibility {
1110 >  char prefix[8];
1111 >  double candidate;
1112 >  char postfix[8];
1113 > };
1114 >
1115 > #define C(cand) { "\nformat:", cand, ":tamrof\n" }
1116 > struct possibility table [] =
1117 > {
1118 >  C( 3.25724264705901305206e+01), /* @@IEEEFP - IEEE 754 */
1119 >  C( 3.53802595280598432000e+18), /* D__float - VAX */
1120 >  C( 5.32201830133125317057e-19), /* D.PDP-10 - PDP-10 - the dot is 0x13a */
1121 >  C( 1.77977764695171661377e+10), /* IBMHEXFP - s/390 format, ascii */
1122 >  C(-5.22995989424860458374e+10)  /* IBMHEXFP - s/390 format, EBCDIC */
1123 > };],
1124 > [if   grep 'format:.@IEEEF.:tamrof' conftest.dmp >/dev/null 2>&1; then
1125 >    ac_cv_c_float_format='IEEE (big-endian)'
1126 >  elif grep 'format:.I@@PFE.:tamrof' conftest.dmp >/dev/null 2>&1; then
1127 >    ac_cv_c_float_format='IEEE (big-endian)'
1128 >  elif grep 'format:.FEEEI@.:tamrof' conftest.dmp >/dev/null 2>&1; then
1129 >    ac_cv_c_float_format='IEEE (little-endian)'
1130 >  elif grep 'format:.EFP@@I.:tamrof' conftest.dmp >/dev/null 2>&1; then
1131 >    ac_cv_c_float_format='IEEE (little-endian)'
1132 >  elif grep 'format:.__floa.:tamrof' conftest.dmp >/dev/null 2>&1; then
1133 >    ac_cv_c_float_format='VAX D-float'
1134 >  elif grep 'format:..PDP-1.:tamrof' conftest.dmp >/dev/null 2>&1; then
1135 >    ac_cv_c_float_format='PDP-10'
1136 >  elif grep 'format:.BMHEXF.:tamrof' conftest.dmp >/dev/null 2>&1; then
1137 >    ac_cv_c_float_format='IBM 370 hex'
1138 >  else
1139 >    AC_MSG_ERROR(Unknown floating point format)
1140 >  fi],
1141 >  [AC_MSG_ERROR(compile failed)])
1142 > ])
1143 > # IEEE is the default format.  If the float endianness isn't the same
1144 > # as the integer endianness, we have to set FLOAT_WORDS_BIG_ENDIAN
1145 > # (which is a tristate: yes, no, default).  This is only an issue with
1146 > # IEEE; the other formats are only supported by a few machines each,
1147 > # all with the same endianness.
1148 > format=IEEE_FLOAT_FORMAT
1149 > fbigend=
1150 > case $ac_cv_c_float_format in
1151 >    'IEEE (big-endian)' )
1152 >        if test $ac_cv_c_bigendian = no; then
1153 >            fbigend=1
1154 >        fi
1155 >        ;;
1156 >    'IEEE (little-endian)' )
1157 >        if test $ac_cv_c_bigendian = yes; then
1158 >            fbigend=0
1159 >        fi
1160 >        ;;
1161 >    'VAX D-float' )
1162 >        format=VAX_FLOAT_FORMAT
1163 >        ;;
1164 >    'PDP-10' )
1165 >        format=PDP10_FLOAT_FORMAT
1166 >        ;;
1167 >    'IBM 370 hex' )
1168 >        format=IBM_FLOAT_FORMAT
1169 >        ;;
1170 > esac
1171 > AC_DEFINE_UNQUOTED(HOST_FLOAT_FORMAT, $format,
1172 >  [Define to the floating point format of the host machine.])
1173 > if test -n "$fbigend"; then
1174 >        AC_DEFINE_UNQUOTED(HOST_FLOAT_WORDS_BIG_ENDIAN, $fbigend,
1175 >  [Define to 1 if the host machine stores floating point numbers in
1176 >   memory with the word containing the sign bit at the lowest address,
1177 >   or to 0 if it does it the other way around.
1178 >
1179 >   This macro should not be defined if the ordering is the same as for
1180 >   multi-word integers.])
1181   fi
1182 < AC_DEFINE_UNQUOTED(NATMEM_OFFSET, $NATMEM_OFFSET,
1183 <  [Define constant offset for Mac address translation])
1182 > ])
1183 >
1184 > dnl Check for host float format
1185 > gcc_AC_C_FLOAT_FORMAT
1186  
1187   dnl Platform specific binary postprocessor
1188   AC_PATH_PROG(BLESS, "true")
# Line 860 | Line 1194 | fi
1194   dnl Check for GCC 2.7 or higher.
1195   HAVE_GCC27=no
1196   AC_MSG_CHECKING(for GCC 2.7 or higher)
1197 < AC_EGREP_CPP(xyes,
1198 < [#if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5
1199 <  xyes
1200 < #endif
1201 < ], [AC_MSG_RESULT(yes); HAVE_GCC27=yes], AC_MSG_RESULT(no))
1197 > AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5)
1198 >                                     # error gcc < 2.7
1199 >                                     typedef syntax error;
1200 >                                     #endif
1201 >                                   ]])],
1202 >                  [AC_MSG_RESULT(yes); HAVE_GCC27=yes],
1203 >                  [AC_MSG_RESULT(no)])
1204  
1205   dnl Check for GCC 3.0 or higher.
1206   HAVE_GCC30=no
1207   AC_MSG_CHECKING(for GCC 3.0 or higher)
1208 < AC_EGREP_CPP(xyes,
1209 < [#if __GNUC__ >= 3
1210 <  xyes
1211 < #endif
1212 < ], [AC_MSG_RESULT(yes); HAVE_GCC30=yes], AC_MSG_RESULT(no))
1208 > AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ >= 3)
1209 >                                     # error gcc < 3
1210 >                                     typedef syntax error;
1211 >                                     #endif
1212 >                                   ]])],
1213 >                  [AC_MSG_RESULT(yes); HAVE_GCC30=yes],
1214 >                  [AC_MSG_RESULT(no)])
1215  
1216   dnl Check for ICC.
1217   AC_MSG_CHECKING(for ICC)
# Line 883 | Line 1221 | if $CXX -V -v 2>&1 | grep -q "Intel(R) C
1221   fi
1222   AC_MSG_RESULT($HAVE_ICC)
1223  
1224 < dnl Test if the compiler can generate ELF objects
1225 < AC_CACHE_CHECK([whether the compiler can generate ELF objects],
1226 <  ac_cv_elf_objects, [
1224 > dnl Determine the generated object format
1225 > AC_CACHE_CHECK([the format of compiler generated objects],
1226 >  ac_cv_object_format, [
1227    echo 'int i;' > conftest.$ac_ext
1228 <  ac_cv_elf_objects=no
1228 >  ac_cv_object_format=no
1229    if AC_TRY_EVAL(ac_compile); then
1230      case `/usr/bin/file conftest.$ac_objext` in
1231      *"ELF"*)
1232 <      ac_cv_elf_objects=yes
1232 >      ac_cv_object_format=elf
1233 >      ;;
1234 >    *"Mach-O"*)
1235 >      ac_cv_object_format=mach
1236 >      ;;
1237 >    *)
1238 >      ac_cv_object_format=unknown
1239        ;;
1240      esac
1241    fi
1242    rm -rf conftest*
1243   ])
1244 < ELF_OBJECTS=$ac_cv_elf_objects
1244 >
1245 > dnl Add -fno-strict-aliasing for slirp sources
1246 > if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1247 >  SAVED_CFLAGS="$CFLAGS"
1248 >  CFLAGS="$CFLAGS -fno-strict-aliasing"
1249 >  AC_CACHE_CHECK([whether the compiler supports -fno-strict-aliasing],
1250 >    ac_cv_gcc_no_strict_aliasing, [
1251 >    AC_TRY_COMPILE([],[],
1252 >      [ac_cv_gcc_no_strict_aliasing=yes; AC_SUBST(SLIRP_CFLAGS, "-fno-strict-aliasing")],
1253 >      [ac_cv_gcc_no_strict_aliasing=no])
1254 >  ])
1255 >  CFLAGS="$SAVED_CFLAGS"
1256 > fi
1257 >
1258 > dnl Add -mdynamic-no-pic for MacOS X (XXX icc10 will support MacOS X)
1259 > if [[ "x$HAVE_GCC30" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
1260 >  SAVED_CFLAGS="$CFLAGS"
1261 >  CFLAGS="$CFLAGS -mdynamic-no-pic"
1262 >  AC_CACHE_CHECK([whether the compiler supports -mdynamic-no-pic],
1263 >    ac_cv_gcc_mdynamic_no_pic, [
1264 >    AC_TRY_COMPILE([],[],[ac_cv_gcc_mdynamic_no_pic=yes],[ac_cv_gcc_mdynamic_no_pic=no])
1265 >  ])
1266 >  if [[ "x$ac_cv_gcc_mdynamic_no_pic" = "xyes" ]]; then
1267 >    CXXFLAGS="$CXXFLAGS -mdynamic-no-pic"
1268 >  else
1269 >    CFLAGS="$SAVED_CFLAGS"
1270 >  fi
1271 > fi
1272  
1273   dnl CPU emulator sources
1274   if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1275    CPUSRCS="\
1276 +    ../kpx_cpu/src/mathlib/ieeefp.cpp \
1277 +    ../kpx_cpu/src/mathlib/mathlib.cpp \
1278      ../kpx_cpu/src/cpu/ppc/ppc-cpu.cpp \
1279      ../kpx_cpu/src/cpu/ppc/ppc-decode.cpp \
1280      ../kpx_cpu/src/cpu/ppc/ppc-execute.cpp \
# Line 912 | Line 1285 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1285    if [[ "x$WANT_JIT" = "xyes" ]]; then
1286      AC_CACHE_CHECK([whether dyngen can be used],
1287        ac_cv_use_dyngen, [
1288 <      case $host_cpu:$ELF_OBJECTS in
1289 <      powerpc:yes)
1288 >      case $host_cpu:$ac_cv_object_format in
1289 >      powerpc:elf)
1290 >        ac_cv_use_dyngen=yes
1291 >        ;;
1292 >      x86_64:elf)
1293 >        ac_cv_use_dyngen=yes
1294 >        ;;
1295 >      i?86:elf)
1296 >        ac_cv_use_dyngen=yes
1297 >        ;;
1298 >      mips:elf)
1299          ac_cv_use_dyngen=yes
1300          ;;
1301 <      x86_64:yes)
1301 >      powerpc:mach)
1302          ac_cv_use_dyngen=yes
1303          ;;
1304 <      i?86:yes)
1304 >      i?86:mach)
1305          ac_cv_use_dyngen=yes
1306          ;;
1307        *:*)
# Line 931 | Line 1313 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1313          if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
1314            DYNGEN_CC=$CXX
1315          else
1316 <          for p in /usr/bin /usr/local/bin; do
1316 >          for p in /usr/bin /usr/local/bin /usr/freeware/bin; do
1317              gxx="$p/g++"
1318              if [[ -x "$gxx" ]]; then
1319                DYNGEN_CC="$gxx"
# Line 939 | Line 1321 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1321            done
1322          fi
1323        fi
1324 <      if [[ -z "$DYNGEN_CC" ]] || ! { echo '#include <limits>' | $DYNGEN_CC -xc++ -c -o /dev/null - >& /dev/null; }; then
1324 >      if [[ -z "$DYNGEN_CC" ]]; then
1325          ac_cv_use_dyngen=no
1326        fi
1327      ])
# Line 947 | Line 1329 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1329        case $host_cpu in
1330        i?86)
1331          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
1332          ;;
1333 <      x86_64)
1334 <        AC_CHECK_HEADERS(mmintrin.h xmmintrin.h emmintrin.h)
1333 >      mips)
1334 >        DYNGEN_OP_FLAGS="-fno-delayed-branch -mno-abicalls"
1335 >        ;;
1336 >      powerpc)
1337 >        if [[ "x$ac_cv_object_format" = "xmach" ]]; then
1338 >          DYNGEN_OP_FLAGS="-mdynamic-no-pic"
1339 >        fi
1340          ;;
1341        esac
1342 <      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-limit=10000"
1343 <      if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1342 >      have_dyngen_gcc3=no
1343 >      case "x`$DYNGEN_CC -dumpversion`" in
1344 >      x[12].*) ;;
1345 >      x*) have_dyngen_gcc3=yes ;;
1346 >      esac
1347 >      if [[ "x$have_dyngen_gcc3" = "xyes" ]]; then
1348 >        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -falign-functions=0"
1349 >      else
1350 >        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
1351 >      fi
1352 >      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-functions -finline-limit=10000 -fno-exceptions -g0"
1353 >      if [[ "x$have_dyngen_gcc3" = "xyes" ]]; then
1354          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-reorder-blocks -fno-optimize-sibling-calls"
1355        fi
1356 +      if [[ "x$DYNGEN_CC" != "x$CXX" ]]; then
1357 +        DYNGEN_CFLAGS="-O2 $CFLAGS"
1358 +        DYNGEN_CXXFLAGS="-O2 $CXXFLAGS"
1359 +      else
1360 +        DYNGEN_CFLAGS="\$(CFLAGS)"
1361 +        DYNGEN_CXXFLAGS="\$(CXXFLAGS)"
1362 +      fi
1363      else
1364        WANT_JIT=no
1365      fi
# Line 991 | Line 1382 | if [[ "x$ac_cv_use_dyngen" = "xyes" ]];
1382    AC_CACHE_CHECK([whether static data regions are executable],
1383      ac_cv_have_static_data_exec, [
1384      AC_TRY_RUN([int main(void) {
1385 < #if defined(__powerpc__)
1385 > #if defined(__powerpc__) || defined(__ppc__)
1386        static unsigned int p[8] = {0x4e800020,};
1387        asm volatile("dcbst 0,%0" : : "r" (p) : "memory");
1388        asm volatile("sync" : : : "memory");
# Line 1007 | Line 1398 | if [[ "x$ac_cv_use_dyngen" = "xyes" ]];
1398      ac_cv_have_static_data_exec=no
1399      )
1400    ])
1401 + else
1402 +  ac_cv_use_dyngen=no
1403   fi
1404   AC_TRANSLATE_DEFINE(HAVE_STATIC_DATA_EXEC, "$ac_cv_have_static_data_exec",
1405    [Define if your system marks static data pages as executable.])
# Line 1015 | Line 1408 | if [[ "x$WANT_JIT" = "xyes" ]]; then
1408    CPPFLAGS="$CPPFLAGS -DUSE_JIT"
1409   fi
1410  
1411 + dnl Higher level optimizations with MIPSPro compilers are possible
1412 + if [[ "x$HAVE_IPA" = "xyes" ]]; then
1413 +  CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'` -O3 -OPT:Olimit=0 -IPA"
1414 +  CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-g//g'` -O3 -OPT:Olimit=0 -IPA"
1415 +  CXXFLAGS="-LANG:std $CXXFLAGS"
1416 +  LDFLAGS="$LDFLAGS -O3 -OPT:Olimit=0 -IPA"
1417 + fi
1418 +
1419   dnl Generate Makefile.
1420 + AC_SUBST(PERL)
1421 + AC_SUBST(USE_DYNGEN, [$ac_cv_use_dyngen])
1422   AC_SUBST(DYNGENSRCS)
1423   AC_SUBST(DYNGEN_CC)
1424 + AC_SUBST(DYNGEN_CFLAGS)
1425 + AC_SUBST(DYNGEN_CXXFLAGS)
1426   AC_SUBST(DYNGEN_OP_FLAGS)
1427   AC_SUBST(SYSSRCS)
1428   AC_SUBST(CPUSRCS)
# Line 1033 | Line 1438 | echo
1438   echo SheepShaver configuration summary:
1439   echo
1440   echo SDL support ...................... : $SDL_SUPPORT
1441 + echo FBDev DGA support ................ : $WANT_FBDEV_DGA
1442   echo XFree86 DGA support .............. : $WANT_XF86_DGA
1443   echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
1444   echo Using PowerPC emulator ........... : $EMULATED_PPC

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines