Hi Guys,
I am committing the patch below which changes the MCU specific linker
script naming scheme for the MSP430. TI have now decided to replace
the MCU specific directories containing memory.ld and peripherals.ld
scripts with individual MCU scripts.
The patch also updates the -mcpu command line option so that it will
accept a wider range of names for the ISA to use.
Cheers
Nick
gcc/ChangeLog
2014-01-23 Nick Clifton <ni...@redhat.com>
* config/msp430/msp430.h (ASM_SPEC): Pass the -mcpu as -mcpu.
(LIB_SPEC): Drop useof memory.ld and peripherals.ld scripts in
favour of mcu specific scripts.
* config/msp430/t-msp430 (MULTILIB_MATCHES): Add more matches for
430x multilibs.
Index: config/msp430/msp430.h
===================================================================
--- config/msp430/msp430.h (revision 206976)
+++ config/msp430/msp430.h (working copy)
@@ -52,7 +52,7 @@
#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 @@
%{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}}} \
"
Index: config/msp430/t-msp430
===================================================================
--- config/msp430/t-msp430 (revision 206976)
+++ config/msp430/t-msp430 (working copy)
@@ -27,6 +27,14 @@
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
