[PATCH] configure: Work around Xcode 12's ld assuming 16KB page sizes.
Brendan Shanks
bshanks at codeweavers.com
Tue Jun 15 15:25:31 CDT 2021
Starting in Xcode 12, ld rounds page sizes and alignments up to 16KB
for all architectures. Passing '-segalign 0x1000' resets this back to
4KB.
Signed-off-by: Brendan Shanks <bshanks at codeweavers.com>
---
I haven't noticed any ill effects from this, but it seems desirable to
keep the PAGEZERO size consistent with previous versions and other OSes.
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 94e586e07b2..603359b6110 100644
--- a/configure.ac
+++ b/configure.ac
@@ -762,10 +762,10 @@ case $host_os in
AC_SUBST(APPKIT_LIBS,"-framework AppKit")
AC_SUBST(SYSTEMCONFIGURATION_LIBS,"-framework SystemConfiguration")
- WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist"
+ WINELOADER_LDFLAGS="-Wl,-pie,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist"
wine_can_build_preloader=yes
- WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000"
+ WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000"
WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main],
[WINEPRELOADER_LDFLAGS="-Wl,-no_new_main $WINEPRELOADER_LDFLAGS"
WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main -nostartfiles -nodefaultlibs],,
--
2.31.1
More information about the wine-devel
mailing list