Revert " Use -Wl,--no-relax rather than -mno-relax for uniformity."

This reverts commit 063f2a04d158ec1b275a925dfbae74b124708cde.

diff --git a/ChangeLog b/ChangeLog
index 6b35a5c..6d786ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -986,10 +986,6 @@
        Allow compilation without thumb-interwork as long as no thumb is
        involved or only thumb2 is used.
 
-2013-12-18  Vladimir Serbinenko  <phcoder@gmail.com>
-
-       Use -Wl,--no-relax rather than -mno-relax for uniformity.
-
 2013-12-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * INSTALL: Update comment as to why sparc64 clang isn't usable.

diff --git a/conf/Makefile.common b/conf/Makefile.common
index e4c301f..51fbaf9 100644 (file)
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -8,7 +8,7 @@ unexport LC_ALL
 # Platform specific options
 if COND_sparc64_ieee1275
   CFLAGS_PLATFORM += -mno-app-regs
-  LDFLAGS_PLATFORM = -Wl,-melf64_sparc -Wl,--no-relax
+  LDFLAGS_PLATFORM = -Wl,-melf64_sparc -mno-relax
 endif
 if COND_sparc64_emu
   CFLAGS_PLATFORM += -mno-app-regs