From 6969ec6cfd1293efd16bf9c7c7063b44bc6880ce Mon Sep 17 00:00:00 2001
From: James Clarke
Date: Mon, 6 Jun 2016 12:02:50 +0100
Subject: Fix linking relocatable objects on Sparc

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 <jrtc27@jrtc27.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 rules.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rules.mak')

diff --git a/rules.mak b/rules.mak
index 4a8f464940..dca5718369 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)$@")
-- 
cgit v1.2.3-55-g7522