Alexandre Julliard : loader: Force building the main loader as PIE on 64-bit.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 78ed343842dcd8ffb95c416420953e121959d40d
URL:    https://gitlab.winehq.org/wine/wine/-/commit/78ed343842dcd8ffb95c416420953e1...

Author: Alexandre Julliard 
Date:   Mon Jun 19 16:32:37 2023 +0200

loader: Force building the main loader as PIE on 64-bit.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55050

---

configure          | 29 +----------------------------
 configure.ac       |  3 +--
 loader/Makefile.in |  1 +
 3 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/configure b/configure
index 93cdaa0a365..98481fd6a49 100755
--- a/configure
+++ b/configure
@@ -10342,34 +10342,7 @@ then :
 fi
         ;;
       *)
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-pie" >&5
-printf %s "checking whether the compiler supports -Wl,-pie... " >&6; }
-if test ${ac_cv_cflags__Wl__pie+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_wine_try_cflags_saved=$CFLAGS
-CFLAGS="$CFLAGS -Wl,-pie"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int main(int argc, char **argv) { return 0; }
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  ac_cv_cflags__Wl__pie=yes
-else $as_nop
-  ac_cv_cflags__Wl__pie=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-CFLAGS=$ac_wine_try_cflags_saved
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__pie" >&5
-printf "%s\n" "$ac_cv_cflags__Wl__pie" >&6; }
-if test "x$ac_cv_cflags__Wl__pie" = xyes
-then :
-  WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-pie"
-fi
+        WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -pie"
         ;;
     esac
     ;;
diff --git a/configure.ac b/configure.ac
index dd8520f6f48..9c98646a344 100644
--- a/configure.ac
+++ b/configure.ac
@@ -787,8 +787,7 @@ case $host_os in
                         [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000"])
         ;;
       *)
-        WINE_TRY_CFLAGS([-Wl,-pie],
-                        [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-pie"])
+        WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -pie"
         ;;
     esac
     ;;
diff --git a/loader/Makefile.in b/loader/Makefile.in
index 7302c231915..30413fc8677 100644
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -12,6 +12,7 @@ SOURCES = \

PROGRAMS = $(WINELOADER_PROGRAMS)
 INSTALL_LIB = $(WINELOADER_PROGRAMS)
+UNIX_CFLAGS = -fPIE

preloader_EXTRADEFS = -fno-builtin