[qemu-xen staging-4.16] Partially revert "build: -no-pie is no functional linker flag"

[patchbot@xxxxxxx]

commit 43a457841f8c61dd4677ec018c3da4b0323ffb4b
Author:     Jessica Clarke <jrtc27@xxxxxxxxxx>
AuthorDate: Thu Aug 5 20:25:45 2021 +0100
Commit:     Michael Roth <michael.roth@xxxxxxx>
CommitDate: Tue Dec 14 14:13:38 2021 -0600

    Partially revert "build: -no-pie is no functional linker flag"
    
    This partially reverts commit bbd2d5a8120771ec59b86a80a1f51884e0a26e53.
    
    This commit was misguided and broke using --disable-pie on any distro
    that enables PIE by default in their compiler driver, including Debian
    and its derivatives. Whilst -no-pie is not a linker flag, it is a
    compiler driver flag that ensures -pie is not automatically passed by it
    to the linker. Without it, all compile_prog checks will fail as any code
    built with the explicit -fno-pie will fail to link with the implicit
    default -pie due to trying to use position-dependent relocations. The
    only bug that needed fixing was LDFLAGS_NOPIE being used as a flag for
    the linker itself in pc-bios/optionrom/Makefile.
    
    Note this does not reinstate exporting LDFLAGS_NOPIE, as it is unused,
    since the only previous use was the one that should not have existed. I
    have also updated the comment for the -fno-pie and -no-pie checks to
    reflect what they're actually needed for.
    
    Fixes: bbd2d5a8120771ec59b86a80a1f51884e0a26e53
    Cc: Christian Ehrhardt <christian.ehrhardt@xxxxxxxxxxxxx>
    Cc: Paolo Bonzini <pbonzini@xxxxxxxxxx>
    Cc: qemu-stable@xxxxxxxxxx
    Signed-off-by: Jessica Clarke <jrtc27@xxxxxxxxxx>
    Message-Id: <20210805192545.38279-1-jrtc27@xxxxxxxxxx>
    Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
    (cherry picked from commit ffd205ef2901bd65fcfbd09a98c0ff7cfcec5e4d)
    Signed-off-by: Michael Roth <michael.roth@xxxxxxx>
---
 configure | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 7659870810..6e308ed77f 100755
--- a/configure
+++ b/configure
@@ -2246,9 +2246,11 @@ static THREAD int tls_var;
 int main(void) { return tls_var; }
 EOF
 
-# Check we support --no-pie first; we will need this for building ROMs.
+# Check we support -fno-pie and -no-pie first; we will need the former for
+# building ROMs, and both for everything if --disable-pie is passed.
 if compile_prog "-Werror -fno-pie" "-no-pie"; then
   CFLAGS_NOPIE="-fno-pie"
+  LDFLAGS_NOPIE="-no-pie"
 fi
 
 if test "$static" = "yes"; then
@@ -2264,6 +2266,7 @@ if test "$static" = "yes"; then
   fi
 elif test "$pie" = "no"; then
   CONFIGURE_CFLAGS="$CFLAGS_NOPIE $CONFIGURE_CFLAGS"
+  CONFIGURE_LDFLAGS="$LDFLAGS_NOPIE $CONFIGURE_LDFLAGS"
 elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then
   CONFIGURE_CFLAGS="-fPIE -DPIE $CONFIGURE_CFLAGS"
   CONFIGURE_LDFLAGS="-pie $CONFIGURE_LDFLAGS"
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#staging-4.16