diff options
| author | Nick Clifton <nickc@redhat.com> | 2014-01-23 16:16:33 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@gcc.gnu.org> | 2014-01-23 16:16:33 +0000 |
| commit | 949ad9715a88d9010f3e6470a97b02080d500396 (patch) | |
| tree | 18cbaa4ba1235ed94f0dd0bb33a7b607e78e7449 /gcc/config | |
| parent | 74558dd9af65ab24f2cd45a1d0959562e6b14d41 (diff) | |
| download | gcc-949ad9715a88d9010f3e6470a97b02080d500396.zip gcc-949ad9715a88d9010f3e6470a97b02080d500396.tar.gz gcc-949ad9715a88d9010f3e6470a97b02080d500396.tar.bz2 | |
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
Diffstat (limited to 'gcc/config')
| -rw-r--r-- | gcc/config/msp430/msp430.h | 6 | ||||
| -rw-r--r-- | gcc/config/msp430/t-msp430 | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/gcc/config/msp430/msp430.h b/gcc/config/msp430/msp430.h index a707999..c3aeefe 100644 --- 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}}} \ " diff --git a/gcc/config/msp430/t-msp430 b/gcc/config/msp430/t-msp430 index 3cbb61c..4779e62 100644 --- 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 |