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

Comparing BasiliskII/src/Unix/configure.ac (file contents):
Revision 1.77 by asvitkine, 2010-07-27T22:52:33Z vs.
Revision 1.78 by asvitkine, 2010-07-28T01:07:45Z

# Line 103 | Line 103 | case "$target_cpu" in
103    x86_64* ) HAVE_X86_64=yes;;
104   esac
105  
106 + dnl Check if we should really be assuming x86_64 even if we detected HAVE_I386 above.
107 + if [[ "x$HAVE_I386" = "xyes" ]]; then
108 +  AC_TRY_RUN([
109 +    int main(void) {
110 +        #if defined(__x86_64__)
111 +                return 0;
112 +        #else
113 +                return 1;
114 +        #endif
115 +    }
116 +  ], [
117 +    HAVE_I386=no
118 +    HAVE_X86_64=yes
119 +  ])
120 + fi
121 +
122 + dnl Check if we should really be assuming x86_64 even if we detected HAVE_I386 above.
123 + if [[ "x$HAVE_I386" = "xyes" ]]; then
124 +  AC_TRY_RUN([
125 +    int main(void) {
126 +        #if defined(__x86_64__)
127 +                return 0;
128 +        #else
129 +                return 1;
130 +        #endif
131 +    }
132 +  ], [
133 +    HAVE_I386=no
134 +    HAVE_X86_64=yes
135 +  ])
136 + fi
137 +
138   dnl Checks for programs.
139   AC_PROG_CC
140   AC_PROG_CC_C_O
# Line 980 | Line 1012 | AC_CACHE_CHECK([whether your system supp
1012    AC_LANG_SAVE
1013    AC_LANG_CPLUSPLUS
1014    AC_TRY_RUN([
983 –    #define HAVE_UNISTD_H 1
1015      #define HAVE_MACH_VM 1
1016      #define HAVE_MACH_TASK_SELF 1
1017      #define HAVE_MACH_EXCEPTIONS 1
# Line 1325 | Line 1356 | if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE
1356    DEFINES="$DEFINES -DUNALIGNED_PROFITABLE -DREGPARAM=\"__attribute__((regparm(3)))\""
1357    if [[ "x$HAVE_GAS" = "xyes" ]]; then
1358      ASM_OPTIMIZATIONS=i386
1359 <    DEFINES="$DEFINES -DX86_ASSEMBLY -DOPTIMIZED_FLAGS -DSAHF_SETO_PROFITABLE"
1359 >    DEFINES="-m32 $DEFINES -DX86_ASSEMBLY -DOPTIMIZED_FLAGS -DSAHF_SETO_PROFITABLE"
1360      JITSRCS="cpuemu1_nf.cpp cpuemu2_nf.cpp cpuemu3_nf.cpp cpuemu4_nf.cpp cpuemu5_nf.cpp cpuemu6_nf.cpp cpuemu7_nf.cpp cpuemu8_nf.cpp $JITSRCS"
1361      CAN_JIT=yes
1362    fi
# Line 1334 | Line 1365 | elif [[ "x$HAVE_GCC30" = "xyes" -a "x$HA
1365    DEFINES="$DEFINES -DUNALIGNED_PROFITABLE"
1366    if [[ "x$HAVE_GAS" = "xyes" ]]; then
1367      ASM_OPTIMIZATIONS="x86-64"
1368 <    DEFINES="$DEFINES -DX86_64_ASSEMBLY -DOPTIMIZED_FLAGS"
1368 >    DEFINES="-m64 $DEFINES -DX86_64_ASSEMBLY -DOPTIMIZED_FLAGS"
1369      JITSRCS="cpuemu1_nf.cpp cpuemu2_nf.cpp cpuemu3_nf.cpp cpuemu4_nf.cpp cpuemu5_nf.cpp cpuemu6_nf.cpp cpuemu7_nf.cpp cpuemu8_nf.cpp $JITSRCS"
1370      CAN_JIT=yes
1371    fi

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines