From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59630) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9sJ8-0003An-KP for qemu-devel@nongnu.org; Mon, 06 Jun 2016 07:02:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b9sJ4-0006j1-FU for qemu-devel@nongnu.org; Mon, 06 Jun 2016 07:02:57 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:33421) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9sJ3-0006ip-9S for qemu-devel@nongnu.org; Mon, 06 Jun 2016 07:02:54 -0400 Received: by mail-wm0-x244.google.com with SMTP id c74so7299647wme.0 for ; Mon, 06 Jun 2016 04:02:52 -0700 (PDT) Date: Mon, 6 Jun 2016 12:02:50 +0100 From: James Clarke Message-ID: <20160606110250.GA43977@Jamess-MacBook.local> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH v2] Fix linking relocatable objects on Sparc List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Michael Tokarev , QEMU Developers , QEMU Trivial On Sparc, gcc implicitly passes --relax to the linker, but -r is incompatible with this. Therefore, if --no-relax is supported, it should be passed to the linker. Signed-off-by: James Clarke --- Hi Peter, Sorry about that, I wasn't building in a git repository, so werror was set to no (I was unaware of the configure script doing so). I have now tested it with werror enabled, and it works (and could reproduce the error with the previous version). I reworked the test slightly to mirror what the Makefile rules actually do, as trying to combine the compilation and ld -r steps doesn't work when CLFAGS contains -pie, which was leading to x86_64 believing that --no-relax was not a valid option. Regards, James configure | 23 ++++++++++++++++++++++- rules.mak | 2 +- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/configure b/configure index b5aab72..4ce7061 100755 --- a/configure +++ b/configure @@ -31,6 +31,7 @@ TMPCXX="${TMPDIR1}/${TMPB}.cxx" TMPL="${TMPDIR1}/${TMPB}.lo" TMPA="${TMPDIR1}/lib${TMPB}.la" TMPE="${TMPDIR1}/${TMPB}.exe" +TMPMO="${TMPDIR1}/${TMPB}.mo" rm -f config.log @@ -4526,6 +4527,25 @@ if compile_prog "" "" ; then have_fsxattr=yes fi +################################################# +# Sparc implicitly links with --relax, which is +# incompatible with -r, so --no-relax should be +# given. It does no harm to give it on other +# platforms too. + +# Note: the prototype is needed since QEMU_CFLAGS +# contains -Wmissing-prototypes +cat > $TMPC << EOF +extern int foo(void); +int foo(void) { return 0; } +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" +fi + ########################################## # End of CC checks # After here, no more $cc or $ld runs @@ -4948,7 +4968,7 @@ if test "$mingw32" = "yes" ; then echo "CONFIG_QGA_NTDDDISK=y" >> $config_host_mak fi if test "$guest_agent_msi" = "yes"; then - echo "QEMU_GA_MSI_ENABLED=yes" >> $config_host_mak + echo "QEMU_GA_MSI_ENABLED=yes" >> $config_host_mak echo "QEMU_GA_MSI_MINGW_DLL_PATH=${QEMU_GA_MSI_MINGW_DLL_PATH}" >> $config_host_mak echo "QEMU_GA_MSI_WITH_VSS=${QEMU_GA_MSI_WITH_VSS}" >> $config_host_mak echo "QEMU_GA_MSI_ARCH=${QEMU_GA_MSI_ARCH}" >> $config_host_mak @@ -5529,6 +5549,7 @@ else fi echo "LDFLAGS=$LDFLAGS" >> $config_host_mak echo "LDFLAGS_NOPIE=$LDFLAGS_NOPIE" >> $config_host_mak +echo "LD_REL_FLAGS=$LD_REL_FLAGS" >> $config_host_mak echo "LIBS+=$LIBS" >> $config_host_mak echo "LIBS_TOOLS+=$libs_tools" >> $config_host_mak echo "EXESUF=$EXESUF" >> $config_host_mak diff --git a/rules.mak b/rules.mak index 4a8f464..dca5718 100644 --- a/rules.mak +++ b/rules.mak @@ -95,7 +95,7 @@ module-common.o: CFLAGS += $(DSO_OBJ_CFLAGS) $(if $(findstring /,$@),$(call quiet-command,cp $@ $(subst /,-,$@), " CP $(subst /,-,$@)")) -LD_REL := $(CC) -nostdlib -Wl,-r +LD_REL := $(CC) -nostdlib -Wl,-r $(LD_REL_FLAGS) %.mo: $(call quiet-command,$(LD_REL) -o $@ $^," LD -r $(TARGET_DIR)$@") -- 2.8.3