[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL for-5.0 06/10] configure: Override the os default with --disable-p
From: |
Richard Henderson |
Subject: |
[PULL for-5.0 06/10] configure: Override the os default with --disable-pie |
Date: |
Mon, 30 Mar 2020 20:54:52 -0700 |
Some distributions, e.g. Ubuntu 19.10, enable PIE by default.
If for some reason one wishes to build a non-pie binary, we
must provide additional options to override.
At the same time, reorg the code to an elif chain.
Reviewed-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
v3: Update for QEMU_LDFLAGS.
---
configure | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/configure b/configure
index 1e622f5acb..481d5077f7 100755
--- a/configure
+++ b/configure
@@ -2124,19 +2124,18 @@ if compile_prog "-Werror -fno-pie" "-no-pie"; then
LDFLAGS_NOPIE="-no-pie"
fi
-if test "$pie" != "no" ; then
- if compile_prog "-fPIE -DPIE" "-pie"; then
- QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"
- QEMU_LDFLAGS="-pie $QEMU_LDFLAGS"
- pie="yes"
- else
- if test "$pie" = "yes"; then
- error_exit "PIE not available due to missing toolchain support"
- else
- echo "Disabling PIE due to missing toolchain support"
- pie="no"
- fi
- fi
+if test "$pie" = "no"; then
+ QEMU_CFLAGS="$CFLAGS_NOPIE $QEMU_CFLAGS"
+ QEMU_LDFLAGS="$LDFLAGS_NOPIE $QEMU_LDFLAGS"
+elif compile_prog "-fPIE -DPIE" "-pie"; then
+ QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"
+ QEMU_LDFLAGS="-pie $QEMU_LDFLAGS"
+ pie="yes"
+elif test "$pie" = "yes"; then
+ error_exit "PIE not available due to missing toolchain support"
+else
+ echo "Disabling PIE due to missing toolchain support"
+ pie="no"
fi
# Detect support for PT_GNU_RELRO + DT_BIND_NOW.
--
2.20.1
- [PULL for-5.0 00/10] tcg patch queue, Richard Henderson, 2020/03/30
- [PULL for-5.0 01/10] configure: Drop adjustment of textseg, Richard Henderson, 2020/03/30
- [PATCH for-5.0] tcg/i386: Fix INDEX_op_dup2_vec, Richard Henderson, 2020/03/30
- [PULL for-5.0 03/10] configure: Do not force pie=no for non-x86, Richard Henderson, 2020/03/30
- [PULL for-5.0 02/10] tcg: Remove softmmu code_gen_buffer fixed address, Richard Henderson, 2020/03/30
- [PULL for-5.0 04/10] configure: Always detect -no-pie toolchain support, Richard Henderson, 2020/03/30
- [PULL for-5.0 05/10] configure: Unnest detection of -z, relro and -z, now, Richard Henderson, 2020/03/30
- [PULL for-5.0 06/10] configure: Override the os default with --disable-pie,
Richard Henderson <=
- [PULL for-5.0 07/10] configure: Support -static-pie if requested, Richard Henderson, 2020/03/30
- [PULL for-5.0 08/10] target/mips: Fix loongson multimedia condition instructions, Richard Henderson, 2020/03/30
- [PULL for-5.0 09/10] tcg/i386: Fix INDEX_op_dup2_vec, Richard Henderson, 2020/03/30
- [PULL for-5.0 10/10] decodetree: Use Python3 floor division operator, Richard Henderson, 2020/03/30
- Re: [PULL for-5.0 00/10] tcg patch queue, Peter Maydell, 2020/03/31