[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-5.0 v3 7/7] configure: Support -static-pie if requested
From: |
Richard Henderson |
Subject: |
[PATCH for-5.0 v3 7/7] configure: Support -static-pie if requested |
Date: |
Fri, 27 Mar 2020 15:03:53 -0700 |
Recent toolchains support static and pie at the same time.
As with normal dynamic builds, allow --static to default to PIE
if supported by the toolchain. Allow --enable/--disable-pie to
override the default.
Reviewed-by: Alex Bennée <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
v2: Fix --disable-pie --static
v3: Update for QEMU_LDFLAGS.
---
configure | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/configure b/configure
index b304bd0cf8..a16ae9a2be 100755
--- a/configure
+++ b/configure
@@ -1067,7 +1067,6 @@ for opt do
;;
--static)
static="yes"
- QEMU_LDFLAGS="-static $QEMU_LDFLAGS"
QEMU_PKG_CONFIG_FLAGS="--static $QEMU_PKG_CONFIG_FLAGS"
;;
--mandir=*) mandir="$optarg"
@@ -2089,11 +2088,6 @@ if test "$static" = "yes" ; then
if test "$modules" = "yes" ; then
error_exit "static and modules are mutually incompatible"
fi
- if test "$pie" = "yes" ; then
- error_exit "static and pie are mutually incompatible"
- else
- pie="no"
- fi
fi
# Unconditional check for compiler __thread support
@@ -2124,7 +2118,18 @@ if compile_prog "-Werror -fno-pie" "-no-pie"; then
LDFLAGS_NOPIE="-no-pie"
fi
-if test "$pie" = "no"; then
+if test "$static" = "yes"; then
+ if test "$pie" != "no" && compile_prog "-fPIE -DPIE" "-static-pie"; then
+ QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"
+ QEMU_LDFLAGS="-static-pie $QEMU_LDFLAGS"
+ pie="yes"
+ elif test "$pie" = "yes"; then
+ error_exit "-static-pie not available due to missing toolchain support"
+ else
+ QEMU_LDFLAGS="-static $QEMU_LDFLAGS"
+ pie="no"
+ fi
+elif test "$pie" = "no"; then
QEMU_CFLAGS="$CFLAGS_NOPIE $QEMU_CFLAGS"
QEMU_LDFLAGS="$LDFLAGS_NOPIE $QEMU_LDFLAGS"
elif compile_prog "-fPIE -DPIE" "-pie"; then
--
2.20.1
- [PATCH for-5.0 v3 0/7] configure: Improve PIE and other linkage, Richard Henderson, 2020/03/27
- [PATCH for-5.0 v3 1/7] configure: Drop adjustment of textseg, Richard Henderson, 2020/03/27
- [PATCH for-5.0 v3 2/7] tcg: Remove softmmu code_gen_buffer fixed address, Richard Henderson, 2020/03/27
- [PATCH for-5.0 v3 3/7] configure: Do not force pie=no for non-x86, Richard Henderson, 2020/03/27
- [PATCH for-5.0 v3 4/7] configure: Always detect -no-pie toolchain support, Richard Henderson, 2020/03/27
- [PATCH for-5.0 v3 5/7] configure: Unnest detection of -z, relro and -z, now, Richard Henderson, 2020/03/27
- [PATCH for-5.0 v3 7/7] configure: Support -static-pie if requested,
Richard Henderson <=
- [PATCH for-5.0 v3 6/7] configure: Override the os default with --disable-pie, Richard Henderson, 2020/03/27