configure: Work around Xcode 12's ld assuming 16KB page sizes.

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@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

configure: Work around Xcode 12's ld assuming 16KB page sizes.
11fd7e83 · Brendan Shanks · Alexandre Julliard · 04b4d0f3 · 11fd7e83 · 11fd7e83
Commit 11fd7e83 authored Jun 15, 2021 by Brendan Shanks Committed by Alexandre Julliard Jun 15, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

configure configure +2 -2

configure.ac configure.ac +2 -2

No files found.
--- a/configure
+++ b/configure
@@ -8781,10 +8781,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
    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"
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-no_new_main -e _main" >&5
 $as_echo_n "checking whether the compiler supports -Wl,-no_new_main -e _main... " >&6; }
 if ${ac_cv_cflags__Wl__no_new_main__e__main+:} false; then :

--- 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],,