msp430.h (ASM_SPEC): Pass the -mcpu as -mcpu.

	* config/msp430/msp430.h (ASM_SPEC): Pass the -mcpu as -mcpu.
	(LIB_SPEC): Drop use of memory.ld and peripherals.ld scripts in
	favour of mcu specific scripts.
	* config/msp430/t-msp430 (MULTILIB_MATCHES): Add more matches for
	430x multilibs.

From-SVN: r206977

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 753df289ad1b72779ea47d2a389b2a3b4e4834f6..68bda3b0855cb80682381b3dbb89950309c3906b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2014-01-23  Nick Clifton  <nickc@redhat.com>
+
+       * config/msp430/msp430.h (ASM_SPEC): Pass the -mcpu as -mcpu.
+       (LIB_SPEC): Drop use of memory.ld and peripherals.ld scripts in
+       favour of mcu specific scripts.
+       * config/msp430/t-msp430 (MULTILIB_MATCHES): Add more matches for
+       430x multilibs.
+
 2014-01-23  James Greenhalgh  <james.greenhalgh@arm.com>
            Alex Velenko  <Alex.Velenko@arm.com>
 

diff --git a/gcc/config/msp430/msp430.h b/gcc/config/msp430/msp430.h
index a707999c5cd64bb95eb1211dbed1447df37fd059..c3aeefedb5a63e7cc7d411cda7f538e1a59e69f4 100644 (file)
--- a/gcc/config/msp430/msp430.h
+++ b/gcc/config/msp430/msp430.h
@@ -52,7 +52,7 @@ extern bool msp430x;
 #define ENDFILE_SPEC "crtend.o%s crtn.o%s -lgcc"
 
 #define ASM_SPEC "-mP " /* Enable polymorphic instructions.  */ \
-  "%{mcpu=*:-mmcu=%*}%{!mcpu=*:%{mmcu=*:-mmcu=%*}} " /* Pass the CPU type on to the assembler.  */ \
+  "%{mcpu=*:-mcpu=%*}%{!mcpu=*:%{mmcu=*:-mmcu=%*}} " /* Pass the CPU type on to the assembler.  */ \
   "%{mrelax=-mQ} " /* Pass the relax option on to the assembler.  */ \
   "%{mlarge:-ml} " /* Tell the assembler if we are building for the LARGE pointer model.  */ \
   "%{!msim:-md} %{msim:%{mlarge:-md}}" /* Copy data from ROM to RAM if necessary.  */ \
@@ -71,8 +71,8 @@ extern bool msp430x;
 %{msim:-lsim}                                          \
 %{!msim:-lnosys}                                       \
 --end-group                                            \
-%{!T*:%{!msim:%{mmcu=*:--script=%*/memory.ld --script=%*/peripherals.ld}}}     \
-%{!T*:%{!msim:%{!mmcu=*:%Tmsp430.ld}}} \
+%{!T*:%{!msim:%{mmcu=*:--script=%*.ld}}}               \
+%{!T*:%{!msim:%{!mmcu=*:%Tmsp430.ld}}}                 \
 %{!T*:%{msim:%{mlarge:%Tmsp430xl-sim.ld}%{!mlarge:%Tmsp430-sim.ld}}} \
 "
 \f

diff --git a/gcc/config/msp430/t-msp430 b/gcc/config/msp430/t-msp430
index 3cbb61cd975f3072a635aced52095d2eccd6664e..4779e62d5fd2d08cb481c94417a95808b2376955 100644 (file)
--- a/gcc/config/msp430/t-msp430
+++ b/gcc/config/msp430/t-msp430
@@ -27,6 +27,14 @@ MULTILIB_DIRNAMES   = 430x large
 MULTILIB_MATCHES    = mcpu?msp430x=mcpu?msp430X
 MULTILIB_MATCHES   += mcpu?msp430x=mcpu?msp430xv2
 MULTILIB_MATCHES   += mcpu?msp430x=mcpu?msp430Xv2
+MULTILIB_MATCHES   += mcpu?msp430x=mmcu?msp430x
+MULTILIB_MATCHES   += mcpu?msp430x=mmcu?msp430X
+MULTILIB_MATCHES   += mcpu?msp430x=mmcu?msp430xv2
+MULTILIB_MATCHES   += mcpu?msp430x=mmcu?msp430Xv2
+MULTILIB_MATCHES   += mcpu?msp430x=mcpu?430x
+MULTILIB_MATCHES   += mcpu?msp430x=mcpu?430X
+MULTILIB_MATCHES   += mcpu?msp430x=mcpu?430xv2
+MULTILIB_MATCHES   += mcpu?msp430x=mcpu?430Xv2
 
 # Add additional MCU matches like this:
 # MULTILIB_MATCHES += mcpu?msp430x=mmcu?xxxxxxxxxx