Commit 236c9391321f83ad40daf03f40c35c9ebc1da6b3
2011-11-12T07:37:40
Fix darwin11 build problem
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260
diff --git a/ChangeLog b/ChangeLog
index f965aec..d193641 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
* m4/ax_enable_builddir: Change from string comparison to numeric
comparison for wc output.
+ * configure.ac: Enable FFI_MMAP_EXEC_WRIT for darwin11 aka Mac OS
+ X 10.7.
+ * configure: Rebuilt.
2011-11-10 Richard Henderson <rth@redhat.com>
diff --git a/configure b/configure
index 4ce690f..bc4bb15 100755
--- a/configure
+++ b/configure
@@ -12240,45 +12240,6 @@ $as_echo "$icc_archflag" >&6; }
# default optimization flags for gcc on all systems
CFLAGS="-O3 -fomit-frame-pointer"
- # -malign-double for x86 systems
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -malign-double" >&5
-$as_echo_n "checking whether C compiler accepts -malign-double... " >&6; }
-if ${ax_cv_c_flags__malign_double+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- ax_save_FLAGS=$CFLAGS
- CFLAGS="-malign-double"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ax_cv_c_flags__malign_double=yes
-else
- ax_cv_c_flags__malign_double=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$ax_save_FLAGS
-fi
-
-eval ax_check_compiler_flags=$ax_cv_c_flags__malign_double
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5
-$as_echo "$ax_check_compiler_flags" >&6; }
-if test "x$ax_check_compiler_flags" = xyes; then
- CFLAGS="$CFLAGS -malign-double"
-else
- :
-fi
-
-
# -fstrict-aliasing for gcc-2.95+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fstrict-aliasing" >&5
$as_echo_n "checking whether C compiler accepts -fstrict-aliasing... " >&6; }
@@ -12318,7 +12279,6 @@ else
fi
- # note that we enable "unsafe" fp optimization with other compilers, too
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -ffast-math" >&5
$as_echo_n "checking whether C compiler accepts -ffast-math... " >&6; }
if ${ax_cv_c_flags__ffast_math+:} false; then :
@@ -13105,7 +13065,7 @@ case "$host" in
TARGET=FRV; TARGETDIR=frv
;;
- hppa*-*-linux* | parisc*-*-linux*)
+ hppa*-*-linux* | parisc*-*-linux* | hppa*-*-openbsd*)
TARGET=PA_LINUX; TARGETDIR=pa
;;
hppa*64-*-hpux*)
@@ -13155,7 +13115,7 @@ case "$host" in
mips-sgi-irix5.* | mips-sgi-irix6.* | mips*-*-rtems*)
TARGET=MIPS; TARGETDIR=mips
;;
- mips*-*-linux*)
+ mips*-*-linux* | mips*-*-openbsd*)
# Support 128-bit long double for NewABI.
HAVE_LONG_DOUBLE='defined(__mips64)'
TARGET=MIPS; TARGETDIR=mips
@@ -13177,7 +13137,7 @@ case "$host" in
powerpc-*-aix* | rs6000-*-aix*)
TARGET=POWERPC_AIX; TARGETDIR=powerpc
;;
- powerpc-*-freebsd*)
+ powerpc-*-freebsd* | powerpc-*-openbsd*)
TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
;;
powerpc64-*-freebsd*)
@@ -14337,7 +14297,7 @@ case "$target" in
$as_echo "#define FFI_EXEC_TRAMPOLINE_TABLE 1" >>confdefs.h
;;
- *-apple-darwin10* | *-*-freebsd* | *-*-openbsd* | *-pc-solaris*)
+ *-apple-darwin1[10]* | *-*-freebsd* | *-*-openbsd* | *-pc-solaris*)
$as_echo "#define FFI_MMAP_EXEC_WRIT 1" >>confdefs.h
diff --git a/configure.ac b/configure.ac
index a8adbc2..8f66d08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -339,7 +339,7 @@ case "$target" in
[Cannot use PROT_EXEC on this target, so, we revert to
alternative means])
;;
- *-apple-darwin10* | *-*-freebsd* | *-*-openbsd* | *-pc-solaris*)
+ *-apple-darwin1[[10]]* | *-*-freebsd* | *-*-openbsd* | *-pc-solaris*)
AC_DEFINE(FFI_MMAP_EXEC_WRIT, 1,
[Cannot use malloc on this target, so, we revert to
alternative means])
diff --git a/patches/darwin11 b/patches/darwin11
new file mode 100644
index 0000000..b3c32b7
--- /dev/null
+++ b/patches/darwin11
@@ -0,0 +1,121 @@
+Index: libffi/ChangeLog
+===================================================================
+--- libffi.orig/ChangeLog
++++ libffi/ChangeLog
+@@ -2,6 +2,9 @@
+
+ * m4/ax_enable_builddir: Change from string comparison to numeric
+ comparison for wc output.
++ * configure.ac: Enable FFI_MMAP_EXEC_WRIT for darwin11 aka Mac OS
++ X 10.7.
++ * configure: Rebuilt.
+
+ 2011-11-10 Richard Henderson <rth@redhat.com>
+
+Index: libffi/configure
+===================================================================
+--- libffi.orig/configure
++++ libffi/configure
+@@ -12240,45 +12240,6 @@ $as_echo "$icc_archflag" >&6; }
+ # default optimization flags for gcc on all systems
+ CFLAGS="-O3 -fomit-frame-pointer"
+
+- # -malign-double for x86 systems
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -malign-double" >&5
+-$as_echo_n "checking whether C compiler accepts -malign-double... " >&6; }
+-if ${ax_cv_c_flags__malign_double+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+-
+- ax_save_FLAGS=$CFLAGS
+- CFLAGS="-malign-double"
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- ax_cv_c_flags__malign_double=yes
+-else
+- ax_cv_c_flags__malign_double=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- CFLAGS=$ax_save_FLAGS
+-fi
+-
+-eval ax_check_compiler_flags=$ax_cv_c_flags__malign_double
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5
+-$as_echo "$ax_check_compiler_flags" >&6; }
+-if test "x$ax_check_compiler_flags" = xyes; then
+- CFLAGS="$CFLAGS -malign-double"
+-else
+- :
+-fi
+-
+-
+ # -fstrict-aliasing for gcc-2.95+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fstrict-aliasing" >&5
+ $as_echo_n "checking whether C compiler accepts -fstrict-aliasing... " >&6; }
+@@ -12318,7 +12279,6 @@ else
+ fi
+
+
+- # note that we enable "unsafe" fp optimization with other compilers, too
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -ffast-math" >&5
+ $as_echo_n "checking whether C compiler accepts -ffast-math... " >&6; }
+ if ${ax_cv_c_flags__ffast_math+:} false; then :
+@@ -13105,7 +13065,7 @@ case "$host" in
+ TARGET=FRV; TARGETDIR=frv
+ ;;
+
+- hppa*-*-linux* | parisc*-*-linux*)
++ hppa*-*-linux* | parisc*-*-linux* | hppa*-*-openbsd*)
+ TARGET=PA_LINUX; TARGETDIR=pa
+ ;;
+ hppa*64-*-hpux*)
+@@ -13155,7 +13115,7 @@ case "$host" in
+ mips-sgi-irix5.* | mips-sgi-irix6.* | mips*-*-rtems*)
+ TARGET=MIPS; TARGETDIR=mips
+ ;;
+- mips*-*-linux*)
++ mips*-*-linux* | mips*-*-openbsd*)
+ # Support 128-bit long double for NewABI.
+ HAVE_LONG_DOUBLE='defined(__mips64)'
+ TARGET=MIPS; TARGETDIR=mips
+@@ -13177,7 +13137,7 @@ case "$host" in
+ powerpc-*-aix* | rs6000-*-aix*)
+ TARGET=POWERPC_AIX; TARGETDIR=powerpc
+ ;;
+- powerpc-*-freebsd*)
++ powerpc-*-freebsd* | powerpc-*-openbsd*)
+ TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
+ ;;
+ powerpc64-*-freebsd*)
+@@ -14337,7 +14297,7 @@ case "$target" in
+ $as_echo "#define FFI_EXEC_TRAMPOLINE_TABLE 1" >>confdefs.h
+
+ ;;
+- *-apple-darwin10* | *-*-freebsd* | *-*-openbsd* | *-pc-solaris*)
++ *-apple-darwin1[10]* | *-*-freebsd* | *-*-openbsd* | *-pc-solaris*)
+
+ $as_echo "#define FFI_MMAP_EXEC_WRIT 1" >>confdefs.h
+
+Index: libffi/configure.ac
+===================================================================
+--- libffi.orig/configure.ac
++++ libffi/configure.ac
+@@ -339,7 +339,7 @@ case "$target" in
+ [Cannot use PROT_EXEC on this target, so, we revert to
+ alternative means])
+ ;;
+- *-apple-darwin10* | *-*-freebsd* | *-*-openbsd* | *-pc-solaris*)
++ *-apple-darwin1[[10]]* | *-*-freebsd* | *-*-openbsd* | *-pc-solaris*)
+ AC_DEFINE(FFI_MMAP_EXEC_WRIT, 1,
+ [Cannot use malloc on this target, so, we revert to
+ alternative means])
diff --git a/patches/series b/patches/series
index 47b8570..3ebccee 100644
--- a/patches/series
+++ b/patches/series
@@ -27,6 +27,7 @@ fix-ppc32
darwin-EH-fix
more-openbsd
more-openbsd-mips
+darwin11
minix
interix-patch