From: Nick Clifton <nickc@gcc.gnu.org>
Date: Tue, 28 Jun 2011 13:59:28 +0000 (+0000)
Subject: mn10300.h (LINK_SPEC): Do not use linker relaxation when performing an incremental... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4a68b724cc4826a24f8c964080635338f4b94480;p=gcc.git

mn10300.h (LINK_SPEC): Do not use linker relaxation when performing an incremental link.

	* config/mn10300/mn10300.h (LINK_SPEC): Do not use linker
	relaxation when performing an incremental link.

From-SVN: r175584
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f655761b060..1ce67633953 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-28  Nick Clifton  <nickc@redhat.com>
+
+	* config/mn10300/mn10300.h (LINK_SPEC): Do not use linker
+	relaxation when performing an incremental link.
+
 2011-06-28  Kai Tietz  <ktietz@redhat.com>
 
 	* tree-ssa-math-opts.c (execute_optimize_bswap): Search
@@ -20,9 +25,9 @@
 
 2011-06-28  Georg-Johann Lay  <avr@gjlay.de>
 
-	* config.gcc (tm_file): Add elfos.h and avr/elf.h for 
+	* config.gcc (tm_file): Add elfos.h and avr/elf.h for
 	avr-*-* and avr-*-rtems* targets.
-	
+
 	* config/avr/elf.h: New file.
 	(ASM_OUTPUT_BEFORE_CASE_LABEL): Define.
 	(TARGET_ASM_SELECT_SECTION): Define.
diff --git a/gcc/config/mn10300/mn10300.h b/gcc/config/mn10300/mn10300.h
index a15615653b5..7f70d5b25d2 100644
--- a/gcc/config/mn10300/mn10300.h
+++ b/gcc/config/mn10300/mn10300.h
@@ -24,7 +24,7 @@
 #undef LIB_SPEC
 #undef ENDFILE_SPEC
 #undef  LINK_SPEC
-#define LINK_SPEC "%{mrelax:--relax}"
+#define LINK_SPEC "%{mrelax:%{!r:--relax}}"
 #undef  STARTFILE_SPEC
 #define STARTFILE_SPEC "%{!mno-crt0:%{!shared:%{pg:gcrt0%O%s}%{!pg:%{p:mcrt0%O%s}%{!p:crt0%O%s}}}}"