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.3 by gbeauche, 2004-06-30T08:51:37Z vs.
Revision 1.27 by gbeauche, 2005-06-22T15:37:25Z

# Line 17 | Line 17 | ulimit -c 0
17   dnl Options.
18   AC_ARG_ENABLE(jit,          [  --enable-jit            enable JIT compiler [default=yes]], [WANT_JIT=$enableval], [WANT_JIT=yes])
19   AC_ARG_ENABLE(ppc-emulator, [  --enable-ppc-emulator   use the selected PowerPC emulator [default=auto]], [WANT_EMULATED_PPC=$enableval], [WANT_EMULATED_PPC=auto])
20 + 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])
21   AC_ARG_ENABLE(xf86-dga,     [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
22 < AC_ARG_ENABLE(xf86-vidmode, [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=no]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=no])
22 > AC_ARG_ENABLE(xf86-vidmode, [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
23   AC_ARG_ENABLE(vosf,         [  --enable-vosf           enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes])
24   AC_ARG_WITH(esd,            [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
25 < AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
25 > AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]],
26 >  [case "$withval" in
27 >   gtk1)      WANT_GTK="gtk";;
28 >   gtk|gtk2)  WANT_GTK="$withval";;
29 >   yes)       WANT_GTK="gtk2 gtk";;
30 >   *)         WANT_GTK="no";;
31 >   esac],
32 >  [WANT_GTK="gtk2 gtk"])
33   AC_ARG_WITH(mon,            [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
34   AC_ARG_WITH(dgcc,           [  --with-dgcc=COMPILER    use C++ COMPILER to compile synthetic opcodes], [DYNGEN_CC=$withval])
35  
36 + dnl Addressing mode
37 + AC_ARG_ENABLE(addressing,
38 +  [  --enable-addressing=AM  set the addressing mode to use [default=real]],
39 +  [case "$enableval" in
40 +   real)        WANT_ADDRESSING_MODE="real";;
41 +   direct)      WANT_ADDRESSING_MODE="direct";;
42 +   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'`;;
43 +   esac],
44 +  [WANT_ADDRESSING_MODE="real"]
45 + )
46 +
47   dnl SDL options.
48   AC_ARG_ENABLE(sdl-static,   [  --enable-sdl-static     use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no])
49   AC_ARG_ENABLE(sdl-video,    [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
50 + AC_ARG_ENABLE(sdl-audio,    [  --enable-sdl-audio      use SDL for audio [default=no]], [WANT_SDL_AUDIO=$enableval], [WANT_SDL_AUDIO=no])
51  
52   dnl Checks for programs.
53   AC_PROG_CC
# Line 36 | Line 56 | AC_PROG_CXX
56   AC_PROG_MAKE_SET
57   AC_PROG_INSTALL
58   AC_PROG_EGREP
59 + AC_PATH_PROGS(FILE, [file false])
60 + AC_PATH_PROG(PERL, [perl])
61  
62   dnl Check for PowerPC target CPU.
63   HAVE_PPC=no
# Line 92 | Line 114 | if [[ "x$WANT_MON" = "xyes" ]]; then
114      WANT_MON=no
115    fi
116   fi
117 + AC_SUBST(MONSRCS)
118  
119   dnl Checks for libraries.
120   AC_CHECK_LIB(posix4, sem_init)
121  
122   dnl Do we need SDL?
123   WANT_SDL=no
101 SDL_SUPPORT="none"
124   if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
125    WANT_SDL=yes
126    WANT_XF86_DGA=no
127    WANT_XF86_VIDMODE=no
128    WANT_FBDEV_DGA=no
129 <  SDL_SUPPORT="video"
129 >  SDL_SUPPORT="$SDL_SUPPORT video"
130 > fi
131 > if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; then
132 >  WANT_SDL=yes
133 >  SDL_SUPPORT="$SDL_SUPPORT audio"
134   fi
135   if [[ "x$WANT_SDL" = "xyes" ]]; then
136    AC_PATH_PROG(sdl_config, "sdl-config")
137    if [[ -n "$sdl_config" ]]; then
138 <    sdl_cflags=`$sdl_config --cflags`
139 <    if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
140 <      sdl_libs=`$sdl_config --static-libs`
141 <    else
142 <      sdl_libs=`$sdl_config --libs`
143 <    fi
138 >    case $target_os in
139 >    # Special treatment for Cygwin so that we can still use the POSIX layer
140 >    *cygwin*)
141 >      sdl_cflags="-I`$sdl_config --prefix`/include/SDL"
142 >      sdl_libs="-L`$sdl_config --exec-prefix`/lib -lSDL"
143 >      ;;
144 >    *)
145 >      sdl_cflags=`$sdl_config --cflags`
146 >      if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
147 >        sdl_libs=`$sdl_config --static-libs`
148 >      else
149 >        sdl_libs=`$sdl_config --libs`
150 >      fi
151 >      ;;
152 >    esac
153      CFLAGS="$CFLAGS $sdl_cflags"
154      CXXFLAGS="$CXXFLAGS $sdl_cflags"
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
163 +  SDL_SUPPORT="none"
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 137 | 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 166 | Line 206 | no:linux*)
206    ;;
207   esac
208  
209 + dnl We use FBDev DGA if possible.
210 + if [[ "x$WANT_FBDEV_DGA" = "xyes" ]]; then
211 +  AC_CHECK_HEADER(linux/fb.h, [
212 +    AC_DEFINE(ENABLE_FBDEV_DGA, 1, [Define if using Linux fbdev extension.])
213 +  ], [
214 +    AC_MSG_WARN([Could not find Linux FBDev extension, ignoring --enable-fbdev-dga.])
215 +    WANT_FBDEV_DGA=no
216 +  ])
217 + fi
218 +
219   dnl We use XFree86 DGA if possible.
220   if [[ "x$WANT_XF86_DGA" = "xyes" ]]; then
221    AC_CHECK_LIB(Xxf86dga, XF86DGAQueryExtension, [
# Line 190 | Line 240 | fi
240  
241   dnl We use GTK+ if possible.
242   UISRCS=../dummy/prefs_editor_dummy.cpp
243 < if [[ "x$WANT_GTK" = "xyes" ]]; then
243 > case "x$WANT_GTK" in
244 > xgtk2*)
245 >  AM_PATH_GTK_2_0(1.3.15, [
246 >    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
247 >    CFLAGS="$CFLAGS $GTK_CFLAGS"
248 >    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
249 >    LIBS="$LIBS $GTK_LIBS"
250 >    UISRCS=prefs_editor_gtk.cpp
251 >    WANT_GTK=gtk2
252 >  ], [
253 >    case "x${WANT_GTK}x" in
254 >    *gtkx)
255 >      AC_MSG_WARN([Could not find GTK+ 2.0, trying with GTK+ 1.2.])
256 >      WANT_GTK=gtk
257 >      ;;
258 >    *)
259 >      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
260 >      WANT_GTK=no
261 >      ;;
262 >    esac
263 >  ])
264 >  ;;
265 > esac
266 > if [[ "x$WANT_GTK" = "xgtk" ]]; then
267    AM_PATH_GTK(1.2.0, [
268      AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
269      CFLAGS="$CFLAGS $GTK_CFLAGS"
# Line 222 | Line 295 | AC_SYS_LARGEFILE
295   dnl Checks for header files.
296   AC_HEADER_STDC
297   AC_HEADER_SYS_WAIT
298 + AC_CHECK_HEADERS(malloc.h)
299   AC_CHECK_HEADERS(mach/vm_map.h mach/mach_init.h sys/mman.h)
300   AC_CHECK_HEADERS(sys/time.h sys/times.h sys/socket.h)
301 < AC_CHECK_HEADERS(unistd.h fcntl.h byteswap.h)
301 > AC_CHECK_HEADERS(unistd.h fcntl.h byteswap.h dirent.h)
302   AC_CHECK_HEADERS(linux/if.h, [], [], [
303   #if HAVE_SYS_SOCKET_H
304   # include <sys/socket.h>
305   #endif
306   ])
307   AC_CHECK_HEADERS(linux/if_tun.h net/if.h net/if_tun.h)
308 + AC_CHECK_HEADERS(fenv.h)
309  
310   dnl Checks for typedefs, structures, and compiler characteristics.
311   AC_C_BIGENDIAN
# Line 272 | Line 347 | AC_CHECK_FUNCS(sigaction signal)
347   AC_CHECK_FUNCS(mmap mprotect munmap)
348   AC_CHECK_FUNCS(vm_allocate vm_deallocate vm_protect)
349   AC_CHECK_FUNCS(posix_memalign memalign valloc)
350 + AC_CHECK_FUNCS(exp2f log2f exp2 log2)
351 + AC_CHECK_FUNCS(floorf roundf ceilf truncf floor round ceil trunc)
352  
353   dnl Darwin seems to define mach_task_self() instead of task_self().
354   AC_CHECK_FUNCS(mach_task_self task_self)
# Line 283 | Line 360 | no:linux*)
360    ;;
361   *:*)
362    AC_SEARCH_LIBS(clock_gettime, [rt posix4])
363 <  AC_CHECK_FUNCS(clock_gettime)
363 >  AC_CHECK_FUNCS(clock_gettime clock_nanosleep)
364    ;;
365   esac
366  
367 + dnl Check for headers and functions related to pty support (sshpty.c)
368 + dnl From openssh-3.2.2p1 configure.ac
369 + AC_CHECK_HEADERS(strings.h login.h sys/bsdtty.h sys/stat.h util.h pty.h)
370 + AC_CHECK_FUNCS(_getpty vhangup strlcpy)
371 +
372 + case "$host" in
373 + *-*-hpux10.26)
374 +        disable_ptmx_check=yes
375 +        ;;
376 + *-*-linux*)
377 +        no_dev_ptmx=1
378 +        ;;
379 + mips-sony-bsd|mips-sony-newsos4)
380 +        AC_DEFINE(HAVE_NEWS4, 1, [Define if you are on NEWS-OS (additions from openssh-3.2.2p1, for sshpty.c).])
381 +        ;;
382 + *-*-sco3.2v4*)
383 +        no_dev_ptmx=1
384 +        ;;
385 + *-*-sco3.2v5*)
386 +        no_dev_ptmx=1
387 +        ;;
388 + *-*-cygwin*)
389 +        no_dev_ptmx=1
390 +        ;;
391 + esac
392 +
393 + if test -z "$no_dev_ptmx" ; then
394 +        if test "x$disable_ptmx_check" != "xyes" ; then
395 +                AC_CHECK_FILE([/dev/ptmx],
396 +                        [
397 +                                AC_DEFINE_UNQUOTED(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx.])
398 +                                have_dev_ptmx=1
399 +                        ]
400 +                )
401 +        fi
402 + fi
403 + AC_CHECK_FILE([/dev/ptc],
404 +        [
405 +                AC_DEFINE_UNQUOTED(HAVE_DEV_PTS_AND_PTC, 1, [Define if you have /dev/ptc.])
406 +                have_dev_ptc=1
407 +        ]
408 + )
409 + dnl (end of code from openssh-3.2.2p1 configure.ac)
410 +
411   dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES)
412   AC_DEFUN(AC_CHECK_FRAMEWORK, [
413    AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])dnl
# Line 314 | Line 435 | SERIALSRC=serial_unix.cpp
435   ETHERSRC=../dummy/ether_dummy.cpp
436   SCSISRC=../dummy/scsi_dummy.cpp
437   AUDIOSRC=../dummy/audio_dummy.cpp
438 + EXTFSSRC=extfs_unix.cpp
439   EXTRASYSSRCS=
440   case "$target_os" in
441   linux*)
# Line 321 | Line 443 | linux*)
443    AUDIOSRC=audio_oss_esd.cpp
444    SCSISRC=Linux/scsi_linux.cpp
445    if [[ "x$EMULATED_PPC" = "xno" ]]; then
446 <    EXTRASYSSRCS="Linux/paranoia.cpp Linux/sheepthreads.c Linux/asm_linux.S"
446 >    EXTRASYSSRCS="Linux/paranoia.cpp Linux/sheepthreads.c ppc_asm.S"
447 >  fi
448 >  ;;
449 > netbsd*)
450 >  if [[ "x$EMULATED_PPC" = "xno" ]]; then
451 >    EXTRASYSSRCS="NetBSD/paranoia.cpp NetBSD/sheepthreads.c ppc_asm.S"
452    fi
453    ;;
454   darwin*)
455    if [[ "x$EMULATED_PPC" = "xno" ]]; then
456 <    EXTRASYSSRCS="Darwin/paranoia.cpp Linux/asm_linux.S"
456 >    EXTRASYSSRCS="Darwin/paranoia.cpp ppc_asm.S"
457    fi
458    if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
459      EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
460    fi
461 +  if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
462 +    EXTFSSRC=../MacOSX/extfs_macosx.mm
463 +  fi
464 +  ;;
465 + cygwin*)
466 +  SERIALSRC="../dummy/serial_dummy.cpp"
467    ;;
468   esac
469  
# Line 339 | Line 472 | if [[ "x$WANT_SDL" = "xyes" ]]; then
472    AC_DEFINE(USE_SDL, 1, [Define to enble SDL support.])
473   fi
474   if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
342  VIDEOSRCS="../SDL/video_sdl.cpp"
475    AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support.])
476 +  VIDEOSRCS="../SDL/video_sdl.cpp"
477    KEYCODES="../SDL/keycodes"
478    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
479      EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/clip_macosx.cpp"
480    else
481 <    EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
481 >    case "$target_os" in
482 >    cygwin*)
483 >      EXTRASYSSRCS="$EXTRASYSSRCS ../Windows/clip_windows.cpp"
484 >      ;;
485 >    *)
486 >      EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
487 >      ;;
488 >    esac
489    fi
490   else
491    VIDEOSRCS="video_x.cpp"
492    KEYCODES="keycodes"
493    EXTRASYSSRCS="$EXTRASYSSRCS clip_unix.cpp"
494   fi
495 + if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; then
496 +  AC_DEFINE(USE_SDL_AUDIO, 1, [Define to enable SDL audio support])
497 +  AUDIOSRC="../SDL/audio_sdl.cpp"
498 + fi
499  
500 < SYSSRCS="$VIDEOSRCS $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
500 > SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
501  
502   dnl Define a macro that translates a yesno-variable into a C macro definition
503   dnl to be put into the config.h file
# Line 657 | Line 801 | fi
801   AC_TRANSLATE_DEFINE(HAVE_MACH_EXCEPTIONS, "$ac_cv_have_mach_exceptions",
802    [Define if your system supports Mach exceptions.])
803  
804 + dnl Check if Windows exceptions are supported.
805 + AC_CACHE_CHECK([whether your system supports Windows exceptions],
806 +  ac_cv_have_win32_exceptions, [
807 +  AC_LANG_SAVE
808 +  AC_LANG_CPLUSPLUS
809 +  AC_TRY_RUN([
810 +    #define HAVE_WIN32_EXCEPTIONS 1
811 +    #define CONFIGURE_TEST_SIGSEGV_RECOVERY
812 +    #include "vm_alloc.cpp"
813 +    #include "sigsegv.cpp"
814 +  ], [
815 +  sigsegv_recovery=win32
816 +  ac_cv_have_win32_exceptions=yes
817 +  ],
818 +  ac_cv_have_win32_exceptions=no,
819 +  dnl When cross-compiling, do not assume anything.
820 +  ac_cv_have_win32_exceptions=no
821 +  )
822 +  AC_LANG_RESTORE
823 +  ]
824 + )
825 + AC_TRANSLATE_DEFINE(HAVE_WIN32_EXCEPTIONS, "$ac_cv_have_win32_exceptions",
826 +  [Define if your system supports Windows exceptions.])
827 +
828   dnl Otherwise, check if extended signals are supported.
829   if [[ -z "$sigsegv_recovery" ]]; then
830    AC_CACHE_CHECK([whether your system supports extended signal handlers],
# Line 743 | Line 911 | else
911      WANT_VOSF=no
912   fi
913  
914 + dnl Check addressing mode to use
915 + AC_MSG_CHECKING([for addressing mode to use])
916 + case "$os_target" in
917 + cygwin*)
918 +  WANT_ADDRESSING_MODE="direct,cygwin-hack"
919 +  NATMEM_OFFSET=
920 +  ;;
921 + esac
922 + if [[ "$EMULATED_PPC" != "yes" ]]; then
923 +  if [[ "$WANT_ADDRESSING_MODE" != "real" ]]; then
924 +    AC_MSG_WARN([Running in native PowerPC mode, force use of Real Addressing.])
925 +    WANT_ADDRESSING_MODE="real"
926 +  fi
927 + fi
928 + if [[ "$WANT_ADDRESSING_MODE" = "direct" ]]; then
929 +  if [[ -n "$NATMEM_OFFSET" ]]; then
930 +    NATMEM_OFFSET_DEF="-DNATMEM_OFFSET=$NATMEM_OFFSET"
931 +  fi
932 +  AC_LANG_SAVE
933 +  AC_LANG_CPLUSPLUS
934 +  cat confdefs.h > conftest.$ac_ext
935 +  cat >> conftest.$ac_ext << EOF
936 + #include <stdio.h>
937 + #include <string.h>
938 + #include "vm_alloc.cpp"
939 +
940 + int main(void)
941 + {
942 +        if (vm_init() < 0)
943 +                return 1;
944 +
945 +        static const struct {
946 +                unsigned long base;
947 +                unsigned int size;
948 +        } ranges[[]] = {
949 +                { 0x00000000, 0x0003000 },
950 +                { 0x10000000, 0x2000000 },
951 +                { 0x40800000, 0x0400000 },
952 +                { 0x68070000, 0x0010000 },
953 +                { 0x69000000, 0x0080000 },
954 +                { 0x68ffe000, 0x0002000 },
955 +                { 0x5fffe000, 0x0002000 },
956 +                { 0x60000000, 0x0040000 },
957 +        };
958 +        const int n_ranges = sizeof(ranges)/ sizeof(ranges[[0]]);
959 +
960 + #ifdef NATMEM_OFFSET
961 +        unsigned long ofs = NATMEM_OFFSET;
962 + #else
963 +        for (unsigned long ofs = 0x10000000; ofs <= 0x90000000; ofs += 0x10000000)
964 + #endif
965 +        for (int i = 0; i < n_ranges; i++) {
966 +                char *m = (char *)(ranges[[i]].base + ofs);
967 +                if (vm_acquire_fixed(m, ranges[[i]].size) != 0)
968 +                        break;
969 +                memset(m, 0, ranges[[i]].size);
970 +                vm_release(m, ranges[[i]].size);
971 +                if (i == n_ranges - 1) {
972 +                        if (sizeof(void *) == 8 && ofs > 0xffffffff)
973 +                                printf("0x%lxul\n", ofs);
974 +                        else
975 +                                printf("0x%08x\n", ofs);
976 +                        return 0;
977 +                }
978 +        }
979 +
980 +        vm_exit();
981 +        return 1;
982 + }
983 + EOF
984 +  doit='$CXX conftest.$ac_ext -o conftest.$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS $LIBS $NATMEM_OFFSET_DEF >& AS_MESSAGE_LOG_FD'
985 +  if AC_TRY_EVAL(doit); then
986 +    NATMEM_OFFSET=`./conftest.$ac_exeext`
987 +  else
988 +    NATMEM_OFFSET=
989 +  fi
990 +  rm -f conftest*
991 +  AC_LANG_RESTORE
992 +
993 +  if [[ -z "$NATMEM_OFFSET" ]]; then
994 +    AC_MSG_ERROR([could not determine a sensible NATMEM_OFFSET value])
995 +  else
996 +    WANT_ADDRESSING_MODE="direct,$NATMEM_OFFSET"
997 +    AC_DEFINE_UNQUOTED(NATMEM_OFFSET, $NATMEM_OFFSET,
998 +      [Define constant offset for Mac address translation])
999 +  fi
1000 + fi
1001 + AC_MSG_RESULT($WANT_ADDRESSING_MODE)
1002 +
1003 + dnl Utility macro used by next two tests.
1004 + dnl AC_EXAMINE_OBJECT(C source code,
1005 + dnl     commands examining object file,
1006 + dnl     [commands to run if compile failed]):
1007 + dnl
1008 + dnl Compile the source code to an object file; then convert it into a
1009 + dnl printable representation.  All unprintable characters and
1010 + dnl asterisks (*) are replaced by dots (.).  All white space is
1011 + dnl deleted.  Newlines (ASCII 0x10) in the input are preserved in the
1012 + dnl output, but runs of newlines are compressed to a single newline.
1013 + dnl Finally, line breaks are forcibly inserted so that no line is
1014 + dnl longer than 80 columns and the file ends with a newline.  The
1015 + dnl result of all this processing is in the file conftest.dmp, which
1016 + dnl may be examined by the commands in the second argument.
1017 + dnl
1018 + AC_DEFUN([gcc_AC_EXAMINE_OBJECT],
1019 + [AC_LANG_SAVE
1020 + AC_LANG_C
1021 + dnl Next bit cribbed from AC_TRY_COMPILE.
1022 + cat > conftest.$ac_ext <<EOF
1023 + [#line __oline__ "configure"
1024 + #include "confdefs.h"
1025 + $1
1026 + ]EOF
1027 + if AC_TRY_EVAL(ac_compile); then
1028 +  od -c conftest.o |
1029 +    sed ['s/^[0-7]*[    ]*/ /
1030 +          s/\*/./g
1031 +          s/ \\n/*/g
1032 +          s/ [0-9][0-9][0-9]/./g
1033 +          s/  \\[^ ]/./g'] |
1034 +    tr -d '
1035 + ' | tr -s '*' '
1036 + ' | fold | sed '$a\
1037 + ' > conftest.dmp
1038 +  $2
1039 + ifelse($3, , , else
1040 +  $3
1041 + )dnl
1042 + fi
1043 + rm -rf conftest*
1044 + AC_LANG_RESTORE])
1045 +
1046 + dnl Floating point format probe.
1047 + dnl The basic concept is the same as the above: grep the object
1048 + dnl file for an interesting string.  We have to watch out for
1049 + dnl rounding changing the values in the object, however; this is
1050 + dnl handled by ignoring the least significant byte of the float.
1051 + dnl
1052 + dnl Does not know about VAX G-float or C4x idiosyncratic format.
1053 + dnl It does know about PDP-10 idiosyncratic format, but this is
1054 + dnl not presently supported by GCC.  S/390 "binary floating point"
1055 + dnl is in fact IEEE (but maybe we should have that in EBCDIC as well
1056 + dnl as ASCII?)
1057 + dnl
1058 + AC_DEFUN([gcc_AC_C_FLOAT_FORMAT],
1059 + [AC_CACHE_CHECK(floating point format, ac_cv_c_float_format,
1060 + [gcc_AC_EXAMINE_OBJECT(
1061 + [/* This will not work unless sizeof(double) == 8.  */
1062 + extern char sizeof_double_must_be_8 [sizeof(double) == 8 ? 1 : -1];
1063 +
1064 + /* This structure must have no internal padding.  */
1065 + struct possibility {
1066 +  char prefix[8];
1067 +  double candidate;
1068 +  char postfix[8];
1069 + };
1070 +
1071 + #define C(cand) { "\nformat:", cand, ":tamrof\n" }
1072 + struct possibility table [] =
1073 + {
1074 +  C( 3.25724264705901305206e+01), /* @@IEEEFP - IEEE 754 */
1075 +  C( 3.53802595280598432000e+18), /* D__float - VAX */
1076 +  C( 5.32201830133125317057e-19), /* D.PDP-10 - PDP-10 - the dot is 0x13a */
1077 +  C( 1.77977764695171661377e+10), /* IBMHEXFP - s/390 format, ascii */
1078 +  C(-5.22995989424860458374e+10)  /* IBMHEXFP - s/390 format, EBCDIC */
1079 + };],
1080 + [if   grep 'format:.@IEEEF.:tamrof' conftest.dmp >/dev/null 2>&1; then
1081 +    ac_cv_c_float_format='IEEE (big-endian)'
1082 +  elif grep 'format:.I@@PFE.:tamrof' conftest.dmp >/dev/null 2>&1; then
1083 +    ac_cv_c_float_format='IEEE (big-endian)'
1084 +  elif grep 'format:.FEEEI@.:tamrof' conftest.dmp >/dev/null 2>&1; then
1085 +    ac_cv_c_float_format='IEEE (little-endian)'
1086 +  elif grep 'format:.EFP@@I.:tamrof' conftest.dmp >/dev/null 2>&1; then
1087 +    ac_cv_c_float_format='IEEE (little-endian)'
1088 +  elif grep 'format:.__floa.:tamrof' conftest.dmp >/dev/null 2>&1; then
1089 +    ac_cv_c_float_format='VAX D-float'
1090 +  elif grep 'format:..PDP-1.:tamrof' conftest.dmp >/dev/null 2>&1; then
1091 +    ac_cv_c_float_format='PDP-10'
1092 +  elif grep 'format:.BMHEXF.:tamrof' conftest.dmp >/dev/null 2>&1; then
1093 +    ac_cv_c_float_format='IBM 370 hex'
1094 +  else
1095 +    AC_MSG_ERROR(Unknown floating point format)
1096 +  fi],
1097 +  [AC_MSG_ERROR(compile failed)])
1098 + ])
1099 + # IEEE is the default format.  If the float endianness isn't the same
1100 + # as the integer endianness, we have to set FLOAT_WORDS_BIG_ENDIAN
1101 + # (which is a tristate: yes, no, default).  This is only an issue with
1102 + # IEEE; the other formats are only supported by a few machines each,
1103 + # all with the same endianness.
1104 + format=IEEE_FLOAT_FORMAT
1105 + fbigend=
1106 + case $ac_cv_c_float_format in
1107 +    'IEEE (big-endian)' )
1108 +        if test $ac_cv_c_bigendian = no; then
1109 +            fbigend=1
1110 +        fi
1111 +        ;;
1112 +    'IEEE (little-endian)' )
1113 +        if test $ac_cv_c_bigendian = yes; then
1114 +            fbigend=0
1115 +        fi
1116 +        ;;
1117 +    'VAX D-float' )
1118 +        format=VAX_FLOAT_FORMAT
1119 +        ;;
1120 +    'PDP-10' )
1121 +        format=PDP10_FLOAT_FORMAT
1122 +        ;;
1123 +    'IBM 370 hex' )
1124 +        format=IBM_FLOAT_FORMAT
1125 +        ;;
1126 + esac
1127 + AC_DEFINE_UNQUOTED(HOST_FLOAT_FORMAT, $format,
1128 +  [Define to the floating point format of the host machine.])
1129 + if test -n "$fbigend"; then
1130 +        AC_DEFINE_UNQUOTED(HOST_FLOAT_WORDS_BIG_ENDIAN, $fbigend,
1131 +  [Define to 1 if the host machine stores floating point numbers in
1132 +   memory with the word containing the sign bit at the lowest address,
1133 +   or to 0 if it does it the other way around.
1134 +
1135 +   This macro should not be defined if the ordering is the same as for
1136 +   multi-word integers.])
1137 + fi
1138 + ])
1139 +
1140 + dnl Check for host float format
1141 + gcc_AC_C_FLOAT_FORMAT
1142 +
1143   dnl Platform specific binary postprocessor
1144   AC_PATH_PROG(BLESS, "true")
1145   if [[ "x$ac_cv_pagezero_hack" = "xyes" ]]; then
# Line 776 | Line 1173 | if $CXX -V -v 2>&1 | grep -q "Intel(R) C
1173   fi
1174   AC_MSG_RESULT($HAVE_ICC)
1175  
1176 < # Test if the compiler can generate ELF objects
1177 < AC_CACHE_CHECK([whether the compiler can generate ELF objects],
1178 <  ac_cv_elf_objects, [
1176 > dnl Determine the generated object format
1177 > AC_CACHE_CHECK([the format of compiler generated objects],
1178 >  ac_cv_object_format, [
1179    echo 'int i;' > conftest.$ac_ext
1180 <  ac_cv_elf_objects=no
1180 >  ac_cv_object_format=no
1181    if AC_TRY_EVAL(ac_compile); then
1182      case `/usr/bin/file conftest.$ac_objext` in
1183      *"ELF"*)
1184 <      ac_cv_elf_objects=yes
1184 >      ac_cv_object_format=elf
1185 >      ;;
1186 >    *"Mach-O"*)
1187 >      ac_cv_object_format=mach
1188 >      ;;
1189 >    *)
1190 >      ac_cv_object_format=unknown
1191        ;;
1192      esac
1193    fi
1194    rm -rf conftest*
1195   ])
793 ELF_OBJECTS=$ac_cv_elf_objects
1196  
1197   dnl CPU emulator sources
1198   if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1199    CPUSRCS="\
1200 +    ../kpx_cpu/src/mathlib/ieeefp.cpp \
1201 +    ../kpx_cpu/src/mathlib/mathlib.cpp \
1202      ../kpx_cpu/src/cpu/ppc/ppc-cpu.cpp \
1203      ../kpx_cpu/src/cpu/ppc/ppc-decode.cpp \
1204      ../kpx_cpu/src/cpu/ppc/ppc-execute.cpp \
# Line 805 | Line 1209 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1209    if [[ "x$WANT_JIT" = "xyes" ]]; then
1210      AC_CACHE_CHECK([whether dyngen can be used],
1211        ac_cv_use_dyngen, [
1212 <      case $host_cpu:$ELF_OBJECTS in
1213 <      powerpc:yes)
1212 >      case $host_cpu:$ac_cv_object_format in
1213 >      powerpc:elf)
1214 >        ac_cv_use_dyngen=yes
1215 >        ;;
1216 >      x86_64:elf)
1217          ac_cv_use_dyngen=yes
1218          ;;
1219 <      x86_64:yes)
1219 >      i?86:elf)
1220          ac_cv_use_dyngen=yes
1221          ;;
1222 <      i?86:yes)
1222 >      powerpc:mach)
1223          ac_cv_use_dyngen=yes
1224          ;;
1225        *:*)
# Line 832 | Line 1239 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1239            done
1240          fi
1241        fi
1242 <      if [[ -z "$DYNGEN_CC" ]] || ! { echo '#include <limits>' | $DYNGEN_CC -xc++ -c -o /dev/null - >& /dev/null; }; then
1242 >      if [[ -z "$DYNGEN_CC" ]]; then
1243          ac_cv_use_dyngen=no
1244        fi
1245      ])
# Line 840 | Line 1247 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1247        case $host_cpu in
1248        i?86)
1249          DYNGEN_OP_FLAGS="-fomit-frame-pointer -mpreferred-stack-boundary=2"
843        if [[ "x$HAVE_GCC30" = "xyes" ]]; then
844          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -falign-functions=0"
845        else
846          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
847        fi
848        saved_CPPFLAGS=$CPPFLAGS
849        CPPFLAGS="$CPPFLAGS -mmmx"
850        AC_CHECK_HEADERS(mmintrin.h,  [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -mmmx"])
851        CPPFLAGS="$CPPFLAGS -msse"
852        AC_CHECK_HEADERS(xmmintrin.h, [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -msse"])
853        CPPFLAGS="$CPPFLAGS -msse2"
854        AC_CHECK_HEADERS(emmintrin.h, [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -msse2"])
855        CPPFLAGS=$saved_CPPFLAGS
1250          ;;
1251 <      x86_64)
1252 <        AC_CHECK_HEADERS(mmintrin.h xmmintrin.h emmintrin.h)
1251 >      powerpc)
1252 >        if [[ "x$ac_cv_object_format" = "xmach" ]]; then
1253 >          DYNGEN_OP_FLAGS="-mdynamic-no-pic"
1254 >        fi
1255          ;;
1256        esac
1257 <      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-limit=10000"
1257 >      if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1258 >        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -falign-functions=0"
1259 >      else
1260 >        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
1261 >      fi
1262 >      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-limit=10000 -fno-exceptions -g0"
1263        if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1264          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-reorder-blocks -fno-optimize-sibling-calls"
1265        fi
# Line 884 | Line 1285 | if [[ "x$ac_cv_use_dyngen" = "xyes" ]];
1285    AC_CACHE_CHECK([whether static data regions are executable],
1286      ac_cv_have_static_data_exec, [
1287      AC_TRY_RUN([int main(void) {
1288 < #if defined(__powerpc__)
1288 > #if defined(__powerpc__) || defined(__ppc__)
1289        static unsigned int p[8] = {0x4e800020,};
1290        asm volatile("dcbst 0,%0" : : "r" (p) : "memory");
1291        asm volatile("sync" : : : "memory");
# Line 900 | Line 1301 | if [[ "x$ac_cv_use_dyngen" = "xyes" ]];
1301      ac_cv_have_static_data_exec=no
1302      )
1303    ])
1304 + else
1305 +  ac_cv_use_dyngen=no
1306   fi
1307   AC_TRANSLATE_DEFINE(HAVE_STATIC_DATA_EXEC, "$ac_cv_have_static_data_exec",
1308    [Define if your system marks static data pages as executable.])
# Line 909 | Line 1312 | if [[ "x$WANT_JIT" = "xyes" ]]; then
1312   fi
1313  
1314   dnl Generate Makefile.
1315 + AC_SUBST(PERL)
1316 + AC_SUBST(USE_DYNGEN, [$ac_cv_use_dyngen])
1317   AC_SUBST(DYNGENSRCS)
1318   AC_SUBST(DYNGEN_CC)
1319   AC_SUBST(DYNGEN_OP_FLAGS)
# Line 916 | Line 1321 | AC_SUBST(SYSSRCS)
1321   AC_SUBST(CPUSRCS)
1322   AC_SUBST(BLESS)
1323   AC_SUBST(KEYCODES)
1324 < AC_OUTPUT(Makefile)
1324 > AC_OUTPUT([
1325 > Makefile
1326 > ../MacOSX/Info.plist
1327 > ])
1328  
1329   dnl Print summary.
1330   echo
1331   echo SheepShaver configuration summary:
1332   echo
1333   echo SDL support ...................... : $SDL_SUPPORT
1334 + echo FBDev DGA support ................ : $WANT_FBDEV_DGA
1335   echo XFree86 DGA support .............. : $WANT_XF86_DGA
1336   echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
1337   echo Using PowerPC emulator ........... : $EMULATED_PPC
# Line 931 | Line 1340 | echo Enable video on SEGV signals .....
1340   echo ESD sound support ................ : $WANT_ESD
1341   echo GTK user interface ............... : $WANT_GTK
1342   echo mon debugger support ............. : $WANT_MON
1343 + echo Addressing mode .................. : $WANT_ADDRESSING_MODE
1344   echo Bad memory access recovery type .. : $sigsegv_recovery
1345   echo
1346   echo "Configuration done. Now type \"make\"."

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines