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

	* 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 f655761b0608de4e030a2ba2fe2cce4fbbda5272..1ce67633953c2a4fc3b39c06ce5e5bc52933b6b2 100644 (file)
--- 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 a15615653b5cc59c3e503091b3e88b79d6fbfcad..7f70d5b25d2b1d480021d4a0698792fb7625b044 100644 (file)
--- 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}}}}"