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.9 by gbeauche, 2004-11-22T22:51:54Z vs.
Revision 1.31 by gbeauche, 2005-07-01T06:16:00Z

# 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  
# Line 31 | Line 39 | AC_ARG_ENABLE(addressing,
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]]*\)/s//\1/p'`;;
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   )
# Line 48 | Line 56 | AC_PROG_CXX
56   AC_PROG_MAKE_SET
57   AC_PROG_INSTALL
58   AC_PROG_EGREP
59 < AC_CHECK_PROGS(FILE, [file false])
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 105 | 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)
# Line 145 | 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 152 | 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 165 | 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 173 | 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)
196    AC_CHECK_FUNCS(pthread_mutexattr_setprotocol)
197    AC_CHECK_FUNCS(pthread_mutexattr_settype)
198    AC_CHECK_FUNCS(pthread_mutexattr_setpshared)
184  if [[ "x$HAVE_PTHREADS" = "xyes" ]]; then
185    AC_DEFINE(HAVE_PTHREADS, 1, [Define if pthreads are available.])
186  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 193 | 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 218 | 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 >  AM_PATH_GTK_2_0(1.3.15, [
249 >    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
250 >    CFLAGS="$CFLAGS $GTK_CFLAGS"
251 >    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
252 >    LIBS="$LIBS $GTK_LIBS"
253 >    UISRCS=prefs_editor_gtk.cpp
254 >    WANT_GTK=gtk2
255 >  ], [
256 >    case "x${WANT_GTK}x" in
257 >    *gtkx)
258 >      AC_MSG_WARN([Could not find GTK+ 2.0, trying with GTK+ 1.2.])
259 >      WANT_GTK=gtk
260 >      ;;
261 >    *)
262 >      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
263 >      WANT_GTK=no
264 >      ;;
265 >    esac
266 >  ])
267 >  ;;
268 > esac
269 > if [[ "x$WANT_GTK" = "xgtk" ]]; then
270    AM_PATH_GTK(1.2.0, [
271      AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
272      CFLAGS="$CFLAGS $GTK_CFLAGS"
# Line 250 | Line 298 | AC_SYS_LARGEFILE
298   dnl Checks for header files.
299   AC_HEADER_STDC
300   AC_HEADER_SYS_WAIT
301 < AC_CHECK_HEADERS(malloc.h)
301 > AC_CHECK_HEADERS(malloc.h stdint.h)
302   AC_CHECK_HEADERS(mach/vm_map.h mach/mach_init.h sys/mman.h)
303   AC_CHECK_HEADERS(sys/time.h sys/times.h sys/socket.h)
304   AC_CHECK_HEADERS(unistd.h fcntl.h byteswap.h dirent.h)
# Line 260 | Line 308 | AC_CHECK_HEADERS(linux/if.h, [], [], [
308   #endif
309   ])
310   AC_CHECK_HEADERS(linux/if_tun.h net/if.h net/if_tun.h)
311 + AC_CHECK_HEADERS(fenv.h)
312  
313   dnl Checks for typedefs, structures, and compiler characteristics.
314   AC_C_BIGENDIAN
# Line 300 | Line 349 | AC_CHECK_FUNCS(nanosleep)
349   AC_CHECK_FUNCS(sigaction signal)
350   AC_CHECK_FUNCS(mmap mprotect munmap)
351   AC_CHECK_FUNCS(vm_allocate vm_deallocate vm_protect)
352 < AC_CHECK_FUNCS(posix_memalign memalign valloc)
352 > AC_CHECK_FUNCS(exp2f log2f exp2 log2)
353 > AC_CHECK_FUNCS(floorf roundf ceilf truncf floor round ceil trunc)
354  
355   dnl Darwin seems to define mach_task_self() instead of task_self().
356   AC_CHECK_FUNCS(mach_task_self task_self)
# Line 312 | Line 362 | no:linux*)
362    ;;
363   *:*)
364    AC_SEARCH_LIBS(clock_gettime, [rt posix4])
365 <  AC_CHECK_FUNCS(clock_gettime)
365 >  AC_CHECK_FUNCS(clock_gettime clock_nanosleep)
366    ;;
367   esac
368  
# Line 395 | Line 445 | linux*)
445    AUDIOSRC=audio_oss_esd.cpp
446    SCSISRC=Linux/scsi_linux.cpp
447    if [[ "x$EMULATED_PPC" = "xno" ]]; then
448 <    EXTRASYSSRCS="Linux/paranoia.cpp Linux/sheepthreads.c Linux/asm_linux.S"
448 >    EXTRASYSSRCS="Linux/paranoia.cpp Linux/sheepthreads.c ppc_asm.S"
449 >  fi
450 >  ;;
451 > netbsd*)
452 >  if [[ "x$EMULATED_PPC" = "xno" ]]; then
453 >    EXTRASYSSRCS="NetBSD/paranoia.cpp NetBSD/sheepthreads.c ppc_asm.S"
454    fi
455    ;;
456   darwin*)
457    if [[ "x$EMULATED_PPC" = "xno" ]]; then
458 <    EXTRASYSSRCS="Darwin/paranoia.cpp Linux/asm_linux.S"
458 >    EXTRASYSSRCS="Darwin/paranoia.cpp ppc_asm.S"
459    fi
460    if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
461      EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
# Line 444 | Line 499 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
499    AUDIOSRC="../SDL/audio_sdl.cpp"
500   fi
501  
502 < SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
502 > SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
503  
504   dnl Define a macro that translates a yesno-variable into a C macro definition
505   dnl to be put into the config.h file
# Line 916 | Line 971 | int main(void)
971                  memset(m, 0, ranges[[i]].size);
972                  vm_release(m, ranges[[i]].size);
973                  if (i == n_ranges - 1) {
974 <                        printf("0x%08x\n", ofs);
974 >                        if (sizeof(void *) == 8 && ofs > 0xffffffff)
975 >                                printf("0x%lxul\n", ofs);
976 >                        else
977 >                                printf("0x%08x\n", ofs);
978                          return 0;
979                  }
980          }
# Line 944 | Line 1002 | EOF
1002   fi
1003   AC_MSG_RESULT($WANT_ADDRESSING_MODE)
1004  
1005 + dnl Utility macro used by next two tests.
1006 + dnl AC_EXAMINE_OBJECT(C source code,
1007 + dnl     commands examining object file,
1008 + dnl     [commands to run if compile failed]):
1009 + dnl
1010 + dnl Compile the source code to an object file; then convert it into a
1011 + dnl printable representation.  All unprintable characters and
1012 + dnl asterisks (*) are replaced by dots (.).  All white space is
1013 + dnl deleted.  Newlines (ASCII 0x10) in the input are preserved in the
1014 + dnl output, but runs of newlines are compressed to a single newline.
1015 + dnl Finally, line breaks are forcibly inserted so that no line is
1016 + dnl longer than 80 columns and the file ends with a newline.  The
1017 + dnl result of all this processing is in the file conftest.dmp, which
1018 + dnl may be examined by the commands in the second argument.
1019 + dnl
1020 + AC_DEFUN([gcc_AC_EXAMINE_OBJECT],
1021 + [AC_LANG_SAVE
1022 + AC_LANG_C
1023 + dnl Next bit cribbed from AC_TRY_COMPILE.
1024 + cat > conftest.$ac_ext <<EOF
1025 + [#line __oline__ "configure"
1026 + #include "confdefs.h"
1027 + $1
1028 + ]EOF
1029 + if AC_TRY_EVAL(ac_compile); then
1030 +  od -c conftest.o |
1031 +    sed ['s/^[0-7]*[    ]*/ /
1032 +          s/\*/./g
1033 +          s/ \\n/*/g
1034 +          s/ [0-9][0-9][0-9]/./g
1035 +          s/  \\[^ ]/./g'] |
1036 +    tr -d '
1037 + ' | tr -s '*' '
1038 + ' | fold | sed '$a\
1039 + ' > conftest.dmp
1040 +  $2
1041 + ifelse($3, , , else
1042 +  $3
1043 + )dnl
1044 + fi
1045 + rm -rf conftest*
1046 + AC_LANG_RESTORE])
1047 +
1048 + dnl Floating point format probe.
1049 + dnl The basic concept is the same as the above: grep the object
1050 + dnl file for an interesting string.  We have to watch out for
1051 + dnl rounding changing the values in the object, however; this is
1052 + dnl handled by ignoring the least significant byte of the float.
1053 + dnl
1054 + dnl Does not know about VAX G-float or C4x idiosyncratic format.
1055 + dnl It does know about PDP-10 idiosyncratic format, but this is
1056 + dnl not presently supported by GCC.  S/390 "binary floating point"
1057 + dnl is in fact IEEE (but maybe we should have that in EBCDIC as well
1058 + dnl as ASCII?)
1059 + dnl
1060 + AC_DEFUN([gcc_AC_C_FLOAT_FORMAT],
1061 + [AC_CACHE_CHECK(floating point format, ac_cv_c_float_format,
1062 + [gcc_AC_EXAMINE_OBJECT(
1063 + [/* This will not work unless sizeof(double) == 8.  */
1064 + extern char sizeof_double_must_be_8 [sizeof(double) == 8 ? 1 : -1];
1065 +
1066 + /* This structure must have no internal padding.  */
1067 + struct possibility {
1068 +  char prefix[8];
1069 +  double candidate;
1070 +  char postfix[8];
1071 + };
1072 +
1073 + #define C(cand) { "\nformat:", cand, ":tamrof\n" }
1074 + struct possibility table [] =
1075 + {
1076 +  C( 3.25724264705901305206e+01), /* @@IEEEFP - IEEE 754 */
1077 +  C( 3.53802595280598432000e+18), /* D__float - VAX */
1078 +  C( 5.32201830133125317057e-19), /* D.PDP-10 - PDP-10 - the dot is 0x13a */
1079 +  C( 1.77977764695171661377e+10), /* IBMHEXFP - s/390 format, ascii */
1080 +  C(-5.22995989424860458374e+10)  /* IBMHEXFP - s/390 format, EBCDIC */
1081 + };],
1082 + [if   grep 'format:.@IEEEF.:tamrof' conftest.dmp >/dev/null 2>&1; then
1083 +    ac_cv_c_float_format='IEEE (big-endian)'
1084 +  elif grep 'format:.I@@PFE.:tamrof' conftest.dmp >/dev/null 2>&1; then
1085 +    ac_cv_c_float_format='IEEE (big-endian)'
1086 +  elif grep 'format:.FEEEI@.:tamrof' conftest.dmp >/dev/null 2>&1; then
1087 +    ac_cv_c_float_format='IEEE (little-endian)'
1088 +  elif grep 'format:.EFP@@I.:tamrof' conftest.dmp >/dev/null 2>&1; then
1089 +    ac_cv_c_float_format='IEEE (little-endian)'
1090 +  elif grep 'format:.__floa.:tamrof' conftest.dmp >/dev/null 2>&1; then
1091 +    ac_cv_c_float_format='VAX D-float'
1092 +  elif grep 'format:..PDP-1.:tamrof' conftest.dmp >/dev/null 2>&1; then
1093 +    ac_cv_c_float_format='PDP-10'
1094 +  elif grep 'format:.BMHEXF.:tamrof' conftest.dmp >/dev/null 2>&1; then
1095 +    ac_cv_c_float_format='IBM 370 hex'
1096 +  else
1097 +    AC_MSG_ERROR(Unknown floating point format)
1098 +  fi],
1099 +  [AC_MSG_ERROR(compile failed)])
1100 + ])
1101 + # IEEE is the default format.  If the float endianness isn't the same
1102 + # as the integer endianness, we have to set FLOAT_WORDS_BIG_ENDIAN
1103 + # (which is a tristate: yes, no, default).  This is only an issue with
1104 + # IEEE; the other formats are only supported by a few machines each,
1105 + # all with the same endianness.
1106 + format=IEEE_FLOAT_FORMAT
1107 + fbigend=
1108 + case $ac_cv_c_float_format in
1109 +    'IEEE (big-endian)' )
1110 +        if test $ac_cv_c_bigendian = no; then
1111 +            fbigend=1
1112 +        fi
1113 +        ;;
1114 +    'IEEE (little-endian)' )
1115 +        if test $ac_cv_c_bigendian = yes; then
1116 +            fbigend=0
1117 +        fi
1118 +        ;;
1119 +    'VAX D-float' )
1120 +        format=VAX_FLOAT_FORMAT
1121 +        ;;
1122 +    'PDP-10' )
1123 +        format=PDP10_FLOAT_FORMAT
1124 +        ;;
1125 +    'IBM 370 hex' )
1126 +        format=IBM_FLOAT_FORMAT
1127 +        ;;
1128 + esac
1129 + AC_DEFINE_UNQUOTED(HOST_FLOAT_FORMAT, $format,
1130 +  [Define to the floating point format of the host machine.])
1131 + if test -n "$fbigend"; then
1132 +        AC_DEFINE_UNQUOTED(HOST_FLOAT_WORDS_BIG_ENDIAN, $fbigend,
1133 +  [Define to 1 if the host machine stores floating point numbers in
1134 +   memory with the word containing the sign bit at the lowest address,
1135 +   or to 0 if it does it the other way around.
1136 +
1137 +   This macro should not be defined if the ordering is the same as for
1138 +   multi-word integers.])
1139 + fi
1140 + ])
1141 +
1142 + dnl Check for host float format
1143 + gcc_AC_C_FLOAT_FORMAT
1144 +
1145   dnl Platform specific binary postprocessor
1146   AC_PATH_PROG(BLESS, "true")
1147   if [[ "x$ac_cv_pagezero_hack" = "xyes" ]]; then
# Line 978 | Line 1176 | fi
1176   AC_MSG_RESULT($HAVE_ICC)
1177  
1178   dnl Determine the generated object format
1179 < AC_CACHE_CHECK([whether the compiler can generate ELF objects],
1179 > AC_CACHE_CHECK([the format of compiler generated objects],
1180    ac_cv_object_format, [
1181    echo 'int i;' > conftest.$ac_ext
1182    ac_cv_object_format=no
# Line 987 | Line 1185 | AC_CACHE_CHECK([whether the compiler can
1185      *"ELF"*)
1186        ac_cv_object_format=elf
1187        ;;
1188 +    *"Mach-O"*)
1189 +      ac_cv_object_format=mach
1190 +      ;;
1191      *)
1192        ac_cv_object_format=unknown
1193        ;;
# Line 995 | Line 1196 | AC_CACHE_CHECK([whether the compiler can
1196    rm -rf conftest*
1197   ])
1198  
1199 + dnl Add -mdynamic-no-pic for MacOS X
1200 + if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1201 +  SAVED_CFLAGS="$CFLAGS"
1202 +  CFLAGS="$CFLAGS -mdynamic-no-pic"
1203 +  AC_CACHE_CHECK([whether the compiler supports -mdynamic-no-pic],
1204 +    ac_cv_gcc_mdynamic_no_pic, [
1205 +    AC_TRY_COMPILE([],[],[ac_cv_gcc_mdynamic_no_pic=yes],[ac_cv_gcc_mdynamic_no_pic=no])
1206 +  ])
1207 +  if [[ "x$ac_cv_gcc_mdynamic_no_pic" = "xyes" ]]; then
1208 +    CXXFLAGS="$CXXFLAGS -mdynamic-no-pic"
1209 +  else
1210 +    CFLAGS="$SAVED_CFLAGS"
1211 +  fi
1212 + fi
1213 +
1214   dnl CPU emulator sources
1215   if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1216    CPUSRCS="\
1217      ../kpx_cpu/src/mathlib/ieeefp.cpp \
1218 +    ../kpx_cpu/src/mathlib/mathlib.cpp \
1219      ../kpx_cpu/src/cpu/ppc/ppc-cpu.cpp \
1220      ../kpx_cpu/src/cpu/ppc/ppc-decode.cpp \
1221      ../kpx_cpu/src/cpu/ppc/ppc-execute.cpp \
# Line 1019 | Line 1236 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1236        i?86:elf)
1237          ac_cv_use_dyngen=yes
1238          ;;
1239 +      powerpc:mach)
1240 +        ac_cv_use_dyngen=yes
1241 +        ;;
1242        *:*)
1243          ac_cv_use_dyngen=no
1244          ;;
# Line 1036 | Line 1256 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1256            done
1257          fi
1258        fi
1259 <      if [[ -z "$DYNGEN_CC" ]] || ! { echo '#include <limits>' | $DYNGEN_CC -xc++ -c -o /dev/null - >& /dev/null; }; then
1259 >      if [[ -z "$DYNGEN_CC" ]]; then
1260          ac_cv_use_dyngen=no
1261        fi
1262      ])
# Line 1044 | Line 1264 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1264        case $host_cpu in
1265        i?86)
1266          DYNGEN_OP_FLAGS="-fomit-frame-pointer -mpreferred-stack-boundary=2"
1047        if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1048          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -falign-functions=0"
1049        else
1050          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
1051        fi
1052        saved_CPPFLAGS=$CPPFLAGS
1053        CPPFLAGS="$CPPFLAGS -mmmx"
1054        AC_CHECK_HEADERS(mmintrin.h,  [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -mmmx"])
1055        CPPFLAGS="$CPPFLAGS -msse"
1056        AC_CHECK_HEADERS(xmmintrin.h, [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -msse"])
1057        CPPFLAGS="$CPPFLAGS -msse2"
1058        AC_CHECK_HEADERS(emmintrin.h, [DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -msse2"])
1059        CPPFLAGS=$saved_CPPFLAGS
1267          ;;
1268 <      x86_64)
1269 <        AC_CHECK_HEADERS(mmintrin.h xmmintrin.h emmintrin.h)
1268 >      powerpc)
1269 >        if [[ "x$ac_cv_object_format" = "xmach" ]]; then
1270 >          DYNGEN_OP_FLAGS="-mdynamic-no-pic"
1271 >        fi
1272          ;;
1273        esac
1274 <      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-limit=10000"
1274 >      if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1275 >        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -falign-functions=0"
1276 >      else
1277 >        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
1278 >      fi
1279 >      DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-limit=10000 -fno-exceptions -g0"
1280        if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1281          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-reorder-blocks -fno-optimize-sibling-calls"
1282        fi
# Line 1088 | Line 1302 | if [[ "x$ac_cv_use_dyngen" = "xyes" ]];
1302    AC_CACHE_CHECK([whether static data regions are executable],
1303      ac_cv_have_static_data_exec, [
1304      AC_TRY_RUN([int main(void) {
1305 < #if defined(__powerpc__)
1305 > #if defined(__powerpc__) || defined(__ppc__)
1306        static unsigned int p[8] = {0x4e800020,};
1307        asm volatile("dcbst 0,%0" : : "r" (p) : "memory");
1308        asm volatile("sync" : : : "memory");
# Line 1104 | Line 1318 | if [[ "x$ac_cv_use_dyngen" = "xyes" ]];
1318      ac_cv_have_static_data_exec=no
1319      )
1320    ])
1321 + else
1322 +  ac_cv_use_dyngen=no
1323   fi
1324   AC_TRANSLATE_DEFINE(HAVE_STATIC_DATA_EXEC, "$ac_cv_have_static_data_exec",
1325    [Define if your system marks static data pages as executable.])
# Line 1113 | Line 1329 | if [[ "x$WANT_JIT" = "xyes" ]]; then
1329   fi
1330  
1331   dnl Generate Makefile.
1332 + AC_SUBST(PERL)
1333 + AC_SUBST(USE_DYNGEN, [$ac_cv_use_dyngen])
1334   AC_SUBST(DYNGENSRCS)
1335   AC_SUBST(DYNGEN_CC)
1336   AC_SUBST(DYNGEN_OP_FLAGS)
# Line 1130 | Line 1348 | echo
1348   echo SheepShaver configuration summary:
1349   echo
1350   echo SDL support ...................... : $SDL_SUPPORT
1351 + echo FBDev DGA support ................ : $WANT_FBDEV_DGA
1352   echo XFree86 DGA support .............. : $WANT_XF86_DGA
1353   echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
1354   echo Using PowerPC emulator ........... : $EMULATED_PPC

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines