Commit 78ed3438 authored by Alexandre Julliard's avatar Alexandre Julliard

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

parent 718068c4
...@@ -10342,34 +10342,7 @@ then : ...@@ -10342,34 +10342,7 @@ then :
fi fi
;; ;;
*) *)
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-pie" >&5 WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -pie"
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
;; ;;
esac esac
;; ;;
......
...@@ -787,8 +787,7 @@ case $host_os in ...@@ -787,8 +787,7 @@ case $host_os in
[WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000"]) [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000"])
;; ;;
*) *)
WINE_TRY_CFLAGS([-Wl,-pie], WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -pie"
[WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-pie"])
;; ;;
esac esac
;; ;;
......
...@@ -12,6 +12,7 @@ SOURCES = \ ...@@ -12,6 +12,7 @@ SOURCES = \
PROGRAMS = $(WINELOADER_PROGRAMS) PROGRAMS = $(WINELOADER_PROGRAMS)
INSTALL_LIB = $(WINELOADER_PROGRAMS) INSTALL_LIB = $(WINELOADER_PROGRAMS)
UNIX_CFLAGS = -fPIE
preloader_EXTRADEFS = -fno-builtin preloader_EXTRADEFS = -fno-builtin
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment