From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Wed, 18 Dec 2013 12:13:23 +0000 (+0100)
Subject: 	Use -Wl,--no-relax rather than -mno-relax for uniformity.
X-Git-Tag: grub-2.02-beta1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=063f2a04d158ec1b275a925dfbae74b124708cde;p=thirdparty%2Fgrub.git

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

diff --git a/ChangeLog b/ChangeLog
index 71bd77e89..80c7cafa9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+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 de55c9ad4..015cd29ce 100644
--- 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 -mno-relax
+  LDFLAGS_PLATFORM = -Wl,-melf64_sparc -Wl,--no-relax
 endif
 if COND_sparc64_emu
   CFLAGS_PLATFORM += -mno-app-regs