Hi Guys,

  With the MN10300, enabling linker relaxation when performing a
  incremental link does not work:

    % mn10300-elf-gcc hello.c -mrelax -r
    collect-ld: --relax and -r may not be used together
    collect2: error: ld returned 1 exit status

  Hence I am applying the patch below as an obvious fix for the problem.
  Tested without regressions on an mn10300-elf toolchain.

Cheers
  Nick

gcc/ChangeLog
2011-06-28  Nick Clifton  <ni...@redhat.com>

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

Index: gcc/config/mn10300/mn10300.h
===================================================================
--- gcc/config/mn10300/mn10300.h        (revision 175576)
+++ gcc/config/mn10300/mn10300.h        (working copy)
@@ -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}}}}"

Reply via email to