OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Nick Clifton 2014-01-23 16:16:33 +00:00 committed by Nick Clifton
parent 74558dd9af
commit 949ad9715a
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ChangeLog
View File

@ -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>

6
gcc/config/msp430/msp430.h
View File

@ -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}}} \
"

8
gcc/config/msp430/t-msp430
View File

@ -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