[Xen-changelog] [qemu-xen master] rules.mak: Also try -r to build modules

[patchbot@xxxxxxx]

commit 7ecf44a57991595b45b9baf47b298fb9fb511969
Author:     Paolo Bonzini <pbonzini@xxxxxxxxxx>
AuthorDate: Tue Nov 29 16:37:20 2016 +0100
Commit:     Stefan Hajnoczi <stefanha@xxxxxxxxxx>
CommitDate: Tue Nov 29 16:21:05 2016 +0000

    rules.mak: Also try -r to build modules
    
    Building qemu fails in distributions where gcc enables PIE by default
    (e.g. Debian unstable) with:
    
    /usr/bin/ld: -r and -pie may not be used together
    
    You have to use -r instead of -Wl,-r to avoid gcc passing -pie to the linker
    when PIE is enabled and a relocatable object is passed.  However, clang
    does not know about -r, so try -Wl,-r first.
    
    [This is a fix for commit c96f0ee6a67ca6277366e78ce5d84d5c20dd596f
    ("rules.mak: Use -r instead of -Wl, -r to fix building when PIE is
    default") which mostly worked but broke the ./configure --enable-modules
    build with clang.
    --Stefan]
    
    Reported-by: Adrian Bunk <bunk@xxxxxxxxx>
    Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
    Message-id: 20161129153720.29747-1-pbonzini@xxxxxxxxxx
    Cc: qemu-stable@xxxxxxxxxx
    Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
    Signed-off-by: Stefan Hajnoczi <stefanha@xxxxxxxxxx>
---
 configure | 10 ++++++++--
 rules.mak |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 89df5c4..3770d7c 100755
--- a/configure
+++ b/configure
@@ -4723,8 +4723,14 @@ EOF
 if ! compile_object ""; then
   error_exit "Failed to compile object file for LD_REL_FLAGS test"
 fi
-if do_cc -nostdlib -Wl,-r -Wl,--no-relax -o $TMPMO $TMPO; then
-  LD_REL_FLAGS="-Wl,--no-relax"
+for i in '-Wl,-r -Wl,--no-relax' -Wl,-r -r; do
+  if do_cc -nostdlib $i -o $TMPMO $TMPO; then
+    LD_REL_FLAGS=$i
+    break
+  fi
+done
+if test "$modules" = "yes" && test "$LD_REL_FLAGS" = ""; then
+  feature_not_found "modules" "Cannot find how to build relocatable objects"
 fi
 
 ##########################################
diff --git a/rules.mak b/rules.mak
index 545ebd9..f4839d2 100644
--- a/rules.mak
+++ b/rules.mak
@@ -93,7 +93,7 @@ module-common.o: CFLAGS += $(DSO_OBJ_CFLAGS)
        $(if $(findstring /,$@),$(call quiet-command,cp $@ $(subst 
/,-,$@),"CP","$(subst /,-,$@)"))
 
 
-LD_REL := $(CC) -nostdlib -r $(LD_REL_FLAGS)
+LD_REL := $(CC) -nostdlib $(LD_REL_FLAGS)
 
 %.mo:
        $(call quiet-command,$(LD_REL) -o $@ $^,"LD","$(TARGET_DIR)$@")
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog