[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PULL for-5.0 04/10] configure: Always detect -no-pie toolchain support

From: Richard Henderson
Subject: [PULL for-5.0 04/10] configure: Always detect -no-pie toolchain support
Date: Mon, 30 Mar 2020 20:54:50 -0700

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.

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
 configure | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index d4c2c7a563..1cdc439a57 100755
--- a/configure
+++ b/configure
@@ -2107,26 +2107,24 @@ if ! compile_prog "-Werror" "" ; then
        "Thread-Local Storage (TLS). Please upgrade to a version that does."
-if test "$pie" != "no" ; then
-  cat > $TMPC << EOF
+cat > $TMPC << EOF
 #ifdef __linux__
 #  define THREAD __thread
 #  define THREAD
 static THREAD int tls_var;
 int main(void) { return tls_var; }
-  # 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"
+if test "$pie" != "no" ; then
   if compile_prog "-fPIE -DPIE" "-pie"; then

reply via email to

[Prev in Thread] Current Thread [Next in Thread]