Module: wine Branch: master Commit: faad187e7037859a88fb4ee6fdcda85a139ed400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faad187e7037859a88fb4ee6fd...
Author: Ken Thomases ken@codeweavers.com Date: Fri May 8 00:44:17 2015 -0500
configure: Set the page zero size to 4KiB on OS X to fix building 64-bit Wine.
---
configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure index d1ab751..e060af8 100755 --- a/configure +++ b/configure @@ -7862,7 +7862,7 @@ uninstall::
APPKIT_LIBS="-framework AppKit"
- LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000,-sectcreate,__TEXT,__info_plist,wine_info.plist" + LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-pagezero_size,0x1000,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000,-sectcreate,__TEXT,__info_plist,wine_info.plist" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-no_pie" >&5 $as_echo_n "checking whether the compiler supports -Wl,-no_pie... " >&6; } if ${ac_cv_cflags__Wl__no_pie+:} false; then : diff --git a/configure.ac b/configure.ac index cb024c5..f529640 100644 --- a/configure.ac +++ b/configure.ac @@ -761,7 +761,7 @@ uninstall:: AC_SUBST(APPLICATIONSERVICES_LIBS,"-framework ApplicationServices") AC_SUBST(CORESERVICES_LIBS,"-framework CoreServices") AC_SUBST(APPKIT_LIBS,"-framework AppKit") - LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000,-sectcreate,__TEXT,__info_plist,wine_info.plist" + LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-pagezero_size,0x1000,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000,-sectcreate,__TEXT,__info_plist,wine_info.plist" WINE_TRY_CFLAGS([-Wl,-no_pie], [LDEXECFLAGS="-Wl,-no_pie $LDEXECFLAGS"]) if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes"