[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL for-5.0 05/10] configure: Unnest detection of -z, relro and -z, no
From: |
Richard Henderson |
Subject: |
[PULL for-5.0 05/10] configure: Unnest detection of -z, relro and -z, now |
Date: |
Mon, 30 Mar 2020 20:54:51 -0700 |
There is nothing about these options that is related to PIE.
Use them unconditionally.
Reviewed-by: Alex Bennée <address@hidden>
Reviewed-by: Fangrui Song <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
v2: Do not split into two tests.
v3: Update to QEMU_LDFLAGS.
---
configure | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 1cdc439a57..1e622f5acb 100755
--- a/configure
+++ b/configure
@@ -2129,9 +2129,6 @@ if test "$pie" != "no" ; then
QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"
QEMU_LDFLAGS="-pie $QEMU_LDFLAGS"
pie="yes"
- if compile_prog "" "-Wl,-z,relro -Wl,-z,now" ; then
- QEMU_LDFLAGS="-Wl,-z,relro -Wl,-z,now $QEMU_LDFLAGS"
- fi
else
if test "$pie" = "yes"; then
error_exit "PIE not available due to missing toolchain support"
@@ -2142,6 +2139,12 @@ if test "$pie" != "no" ; then
fi
fi
+# Detect support for PT_GNU_RELRO + DT_BIND_NOW.
+# The combination is known as "full relro", because .got.plt is read-only too.
+if compile_prog "" "-Wl,-z,relro -Wl,-z,now" ; then
+ QEMU_LDFLAGS="-Wl,-z,relro -Wl,-z,now $QEMU_LDFLAGS"
+fi
+
##########################################
# __sync_fetch_and_and requires at least -march=i486. Many toolchains
# use i686 as default anyway, but for those that don't, an explicit
--
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 <=
- [PULL for-5.0 06/10] configure: Override the os default with --disable-pie, Richard Henderson, 2020/03/30
- [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