[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/7] configure: Always detect -no-pie toolchain support
From: |
Richard Henderson |
Subject: |
[PATCH 4/7] configure: Always detect -no-pie toolchain support |
Date: |
Tue, 17 Dec 2019 17:19:17 -1000 |
The CFLAGS_NOPIE and LDFLAGS_NOPIE variables are used
in pc-bios/optionrom/Makefile, which has nothing to do
with the PIE setting of the main qemu executables.
This overrides any operating system default to build
all executables as PIE, which is important for ROMs.
Signed-off-by: Richard Henderson <address@hidden>
---
configure | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/configure b/configure
index 2fb4457d7c..972ce7396f 100755
--- a/configure
+++ b/configure
@@ -2012,26 +2012,24 @@ if ! compile_prog "-Werror" "" ; then
"Thread-Local Storage (TLS). Please upgrade to a version that does."
fi
-if test "$pie" != "no" ; then
- cat > $TMPC << EOF
+cat > $TMPC << EOF
#ifdef __linux__
# define THREAD __thread
#else
# define THREAD
#endif
-
static THREAD int tls_var;
-
int main(void) { return tls_var; }
-
EOF
- # check we support --no-pie first...
- if compile_prog "-Werror -fno-pie" "-no-pie"; then
- CFLAGS_NOPIE="-fno-pie"
- LDFLAGS_NOPIE="-nopie"
- fi
+# Check we support --no-pie first; we will need this for building ROMs.
+if compile_prog "-Werror -fno-pie" "-no-pie"; then
+ CFLAGS_NOPIE="-fno-pie"
+ 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"
--
2.20.1
- [PATCH 0/7] configure: Improve PIE and other linkage, Richard Henderson, 2019/12/17
- [PATCH 1/7] configure: Drop adjustment of textseg, Richard Henderson, 2019/12/17
- [PATCH 2/7] tcg: Remove softmmu code_gen_buffer fixed address, Richard Henderson, 2019/12/17
- [PATCH 3/7] configure: Do not force pie=no for non-x86, Richard Henderson, 2019/12/17
- [PATCH 4/7] configure: Always detect -no-pie toolchain support,
Richard Henderson <=
- [PATCH 5/7] configure: Unnest detection of -z,relro and -z,now, Richard Henderson, 2019/12/17
- [PATCH 7/7] configure: Support -static-pie if requested, Richard Henderson, 2019/12/17
- [PATCH 6/7] configure: Override the os default with --disable-pie, Richard Henderson, 2019/12/17