[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/41] configure: Override the os default with --disable-pie
From: |
Richard Henderson |
Subject: |
[PULL 06/41] configure: Override the os default with --disable-pie |
Date: |
Wed, 8 Jan 2020 14:44:48 +1100 |
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>
---
configure | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/configure b/configure
index 1dd12edcc3..de2c4867ad 100755
--- a/configure
+++ b/configure
@@ -2036,19 +2036,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"
- LDFLAGS="-pie $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"
+ LDFLAGS="$LDFLAGS_NOPIE $LDFLAGS"
+elif compile_prog "-fPIE -DPIE" "-pie"; then
+ QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"
+ LDFLAGS="-pie $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 00/41] tcg patch queue, Richard Henderson, 2020/01/07
- [PULL 02/41] tcg: Remove softmmu code_gen_buffer fixed address, Richard Henderson, 2020/01/07
- [PULL 01/41] configure: Drop adjustment of textseg, Richard Henderson, 2020/01/07
- [PULL 03/41] configure: Do not force pie=no for non-x86, Richard Henderson, 2020/01/07
- [PULL 04/41] configure: Always detect -no-pie toolchain support, Richard Henderson, 2020/01/07
- [PULL 05/41] configure: Unnest detection of -z,relro and -z,now, Richard Henderson, 2020/01/07
- [PULL 06/41] configure: Override the os default with --disable-pie,
Richard Henderson <=
- [PULL 07/41] configure: Support -static-pie if requested, Richard Henderson, 2020/01/07
- [PULL 08/41] target/xtensa: Use probe_access for itlb_hit_test, Richard Henderson, 2020/01/07
- [PULL 09/41] cputlb: Use trace_mem_get_info instead of trace_mem_build_info, Richard Henderson, 2020/01/07
- [PULL 10/41] trace: Remove trace_mem_build_info_no_se_[bl]e, Richard Henderson, 2020/01/07
- [PULL 11/41] target/s390x: Include tcg.h in mem_helper.c, Richard Henderson, 2020/01/07
- [PULL 12/41] target/arm: Include tcg.h in sve_helper.c, Richard Henderson, 2020/01/07
- [PULL 13/41] accel/tcg: Include tcg.h in tcg-runtime.c, Richard Henderson, 2020/01/07
- [PULL 14/41] linux-user: Include tcg.h in syscall.c, Richard Henderson, 2020/01/07
- [PULL 15/41] linux-user: Include trace-root.h in syscall-trace.h, Richard Henderson, 2020/01/07
- [PULL 16/41] plugins: Include trace/mem.h in api.c, Richard Henderson, 2020/01/07