* emulparams/msp430all.sh: Update ARCH names.

	* cpu-msp430.c: Use printable names that match the values
	displayed by readelf.

2 files changed, 54 insertions, 50 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index e93bdea29b..87f834310b 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-30  Nick Clifton  <nickc@redhat.com>
+
+	* emulparams/msp430all.sh: Update ARCH names.
+
 2013-09-24  Alan Modra  <amodra@gmail.com>
 
 	* emulparams/elf32ppccommon.sh (LIBPATH_SUFFIX): Provide 32-bit
diff --git a/ld/emulparams/msp430all.sh b/ld/emulparams/msp430all.sh
index 3a2f79dc3a..33d975e4e4 100644
--- a/ld/emulparams/msp430all.sh
+++ b/ld/emulparams/msp430all.sh
@@ -13,7 +13,7 @@ MAXPAGESIZE=1
 EMBEDDED=yes
 
 if [ "${MSP430_NAME}" = "msp430x110" ] ; then
-ARCH=msp:11
+ARCH=MSP430
 ROM_START=0xfc00
 ROM_SIZE=0x3e0
 RAM_START=0x0200
@@ -22,7 +22,7 @@ STACK=0x280
 fi
 
 if [ "${MSP430_NAME}" = "msp430x1101" ] ; then
-ARCH=msp:110
+ARCH=MSP430x11x1
 ROM_START=0xfc00
 ROM_SIZE=0x3e0
 RAM_START=0x0200
@@ -31,7 +31,7 @@ STACK=0x280
 fi
 
 if [ "${MSP430_NAME}" = "msp430x1111" ] ; then
-ARCH=msp:110
+ARCH=MSP430x11x1
 ROM_START=0xf800
 ROM_SIZE=0x07e0
 RAM_START=0x0200
@@ -40,7 +40,7 @@ STACK=0x280
 fi
 
 if [ "${MSP430_NAME}" = "msp430x112" ] ; then
-ARCH=msp:11
+ARCH=MSP430
 ROM_START=0xf000
 ROM_SIZE=0xfe0
 RAM_START=0x0200
@@ -49,7 +49,7 @@ STACK=0x300
 fi
 
 if [ "${MSP430_NAME}" = "msp430x1121" ] ; then
-ARCH=msp:110
+ARCH=MSP430x11x1
 ROM_START=0xf000
 ROM_SIZE=0x0fe0
 RAM_START=0x0200
@@ -58,7 +58,7 @@ STACK=0x300
 fi
 
 if [ "${MSP430_NAME}" = "msp430x1122" ] ; then
-ARCH=msp:110
+ARCH=MSP430x11x1
 ROM_START=0xf000
 ROM_SIZE=0x0fe0
 RAM_START=0x0200
@@ -67,7 +67,7 @@ STACK=0x300
 fi
 
 if [ "${MSP430_NAME}" = "msp430x1132" ] ; then
-ARCH=msp:110
+ARCH=MSP430x11x1
 ROM_START=0xe000
 ROM_SIZE=0x1fe0
 RAM_START=0x0200
@@ -85,7 +85,7 @@ STACK=0x300
 fi
 
 if [ "${MSP430_NAME}" = "msp430x1222" ] ; then
-ARCH=msp:12
+ARCH=MSP430x12
 ROM_START=0xf000
 ROM_SIZE=0xfe0
 RAM_START=0x0200
@@ -94,7 +94,7 @@ STACK=0x300
 fi
 
 if [ "${MSP430_NAME}" = "msp430x123" ] ; then
-ARCH=msp:12
+ARCH=MSP430x12
 ROM_START=0xe000
 ROM_SIZE=0x1fe0
 RAM_START=0x0200
@@ -103,7 +103,7 @@ STACK=0x300
 fi
 
 if [ "${MSP430_NAME}" = "msp430x1232" ] ; then
-ARCH=msp:12
+ARCH=MSP430x12
 ROM_START=0xe000
 ROM_SIZE=0x1fe0
 RAM_START=0x0200
@@ -112,7 +112,7 @@ STACK=0x300
 fi
 
 if [ "${MSP430_NAME}" = "msp430x133" ] ; then
-ARCH=msp:13
+ARCH=MSP430x13
 ROM_START=0xe000
 ROM_SIZE=0x1fe0
 RAM_START=0x0200
@@ -121,7 +121,7 @@ STACK=0x300
 fi
 
 if [ "${MSP430_NAME}" = "msp430x1331" ] ; then
-ARCH=msp:13
+ARCH=MSP430x13
 ROM_START=0xe000
 ROM_SIZE=0x1fe0
 RAM_START=0x0200
@@ -130,7 +130,7 @@ STACK=0x300
 fi
 
 if [ "${MSP430_NAME}" = "msp430x135" ] ; then
-ARCH=msp:13
+ARCH=MSP430x13
 ROM_START=0xc000
 ROM_SIZE=0x3fe0
 RAM_START=0x0200
@@ -139,7 +139,7 @@ STACK=0x400
 fi
 
 if [ "${MSP430_NAME}" = "msp430x1351" ] ; then
-ARCH=msp:13
+ARCH=MSP430x13
 ROM_START=0xc000
 ROM_SIZE=0x3fe0
 RAM_START=0x0200
@@ -148,7 +148,7 @@ STACK=0x400
 fi
 
 if [ "${MSP430_NAME}" = "msp430x147" ] ; then
-ARCH=msp:14
+ARCH=MSP430x14
 ROM_START=0x8000
 ROM_SIZE=0x7fe0
 RAM_START=0x0200
@@ -157,7 +157,7 @@ STACK=0x600
 fi
 
 if [ "${MSP430_NAME}" = "msp430x148" ] ; then
-ARCH=msp:14
+ARCH=MSP430x14
 ROM_START=0x4000
 ROM_SIZE=0xbfe0
 RAM_START=0x0200
@@ -166,7 +166,7 @@ STACK=0xa00
 fi
 
 if [ "${MSP430_NAME}" = "msp430x149" ] ; then
-ARCH=msp:14
+ARCH=MSP430x14
 ROM_START=0x1100
 ROM_SIZE=0xeee0
 RAM_START=0x0200
@@ -175,7 +175,7 @@ STACK=0xa00
 fi
 
 if [ "${MSP430_NAME}" = "msp430x155" ] ; then
-ARCH=msp:15
+ARCH=MSP430x15
 ROM_START=0xc000
 ROM_SIZE=0x3fe0
 RAM_START=0x0200
@@ -184,7 +184,7 @@ STACK=0x400
 fi
 
 if [ "${MSP430_NAME}" = "msp430x156" ] ; then
-ARCH=msp:15
+ARCH=MSP430x15
 ROM_START=0xa000
 ROM_SIZE=0x5fe0
 RAM_START=0x0200
@@ -193,7 +193,7 @@ STACK=0x400
 fi
 
 if [ "${MSP430_NAME}" = "msp430x157" ] ; then
-ARCH=msp:15
+ARCH=MSP430x15
 ROM_START=0x8000
 ROM_SIZE=0x7fe0
 RAM_START=0x0200
@@ -202,7 +202,7 @@ STACK=0x600
 fi
 
 if [ "${MSP430_NAME}" = "msp430x167" ] ; then
-ARCH=msp:16
+ARCH=MSP430X16
 ROM_START=0x8000
 ROM_SIZE=0x7fe0
 RAM_START=0x0200
@@ -211,7 +211,7 @@ STACK=0x600
 fi
 
 if [ "${MSP430_NAME}" = "msp430x168" ] ; then
-ARCH=msp:16
+ARCH=MSP430X16
 ROM_START=0x4000
 ROM_SIZE=0xbfe0
 RAM_START=0x0200
@@ -220,7 +220,7 @@ STACK=0xa00
 fi
 
 if [ "${MSP430_NAME}" = "msp430x169" ] ; then
-ARCH=msp:16
+ARCH=MSP430X16
 ROM_START=0x1100
 ROM_SIZE=0xeee0
 RAM_START=0x0200
@@ -229,7 +229,7 @@ STACK=0xa00
 fi
 
 if [ "${MSP430_NAME}" = "msp430x1610" ] ; then
-ARCH=msp:16
+ARCH=MSP430X16
 ROM_START=0x8000
 ROM_SIZE=0x7fe0
 RAM_START=0x1100
@@ -238,7 +238,7 @@ STACK=0x2500
 fi
 
 if [ "${MSP430_NAME}" = "msp430x1611" ] ; then
-ARCH=msp:16
+ARCH=MSP430X16
 ROM_START=0x4000
 ROM_SIZE=0xbfe0
 RAM_START=0x1100
@@ -247,7 +247,7 @@ STACK=0x3900
 fi
 
 if [ "${MSP430_NAME}" = "msp430x1612" ] ; then
-ARCH=msp:16
+ARCH=MSP430X16
 ROM_START=0x2500
 ROM_SIZE=0xdae0
 RAM_START=0x1100
@@ -256,7 +256,7 @@ STACK=0x2500
 fi
 
 if [ "${MSP430_NAME}" = "msp430x2101" ] ; then
-ARCH=msp:21
+ARCH=MSP430x21
 ROM_START=0xFC00
 ROM_SIZE=0x03e0
 RAM_START=0x0200
@@ -265,7 +265,7 @@ STACK=0x280
 fi
 
 if [ "${MSP430_NAME}" = "msp430x2111" ] ; then
-ARCH=msp:21
+ARCH=MSP430x21
 ROM_START=0xF800
 ROM_SIZE=0x07e0
 RAM_START=0x0200
@@ -274,7 +274,7 @@ STACK=0x280
 fi
 
 if [ "${MSP430_NAME}" = "msp430x2121" ] ; then
-ARCH=msp:21
+ARCH=MSP430x21
 ROM_START=0xf000
 ROM_SIZE=0x0fe0
 RAM_START=0x0200
@@ -283,7 +283,7 @@ STACK=0x300
 fi
 
 if [ "${MSP430_NAME}" = "msp430x2131" ] ; then
-ARCH=msp:21
+ARCH=MSP430x21
 ROM_START=0xe000
 ROM_SIZE=0x1fe0
 RAM_START=0x0200
@@ -292,7 +292,7 @@ STACK=0x300
 fi
 
 if [ "${MSP430_NAME}" = "msp430x311" ] ; then
-ARCH=msp:31
+ARCH=MSP430x31
 SCRIPT_NAME=elf32msp430_3
 ROM_START=0xf800
 ROM_SIZE=0x07e0
@@ -302,7 +302,7 @@ STACK=0x280
 fi
 
 if [ "${MSP430_NAME}" = "msp430x312" ] ; then
-ARCH=msp:31
+ARCH=MSP430x31
 SCRIPT_NAME=elf32msp430_3
 ROM_START=0xf000
 ROM_SIZE=0x0fe0
@@ -312,7 +312,7 @@ STACK=0x300
 fi
 
 if [ "${MSP430_NAME}" = "msp430x313" ] ; then
-ARCH=msp:31
+ARCH=MSP430x31
 SCRIPT_NAME=elf32msp430_3
 ROM_START=0xe000
 ROM_SIZE=0x1fe0
@@ -322,7 +322,7 @@ STACK=0x300
 fi
 
 if [ "${MSP430_NAME}" = "msp430x314" ] ; then
-ARCH=msp:31
+ARCH=MSP430x31
 SCRIPT_NAME=elf32msp430_3
 ROM_START=0xd000
 ROM_SIZE=0x2fe0
@@ -332,7 +332,7 @@ STACK=0x400
 fi
 
 if [ "${MSP430_NAME}" = "msp430x315" ] ; then
-ARCH=msp:31
+ARCH=MSP430x31
 SCRIPT_NAME=elf32msp430_3
 ROM_START=0xc000
 ROM_SIZE=0x3fe0
@@ -342,7 +342,7 @@ STACK=0x400
 fi
 
 if [ "${MSP430_NAME}" = "msp430x323" ] ; then
-ARCH=msp:32
+ARCH=MSP430x32
 SCRIPT_NAME=elf32msp430_3
 ROM_START=0xe000
 ROM_SIZE=0x1fe0
@@ -352,7 +352,7 @@ STACK=0x300
 fi
 
 if [ "${MSP430_NAME}" = "msp430x325" ] ; then
-ARCH=msp:32
+ARCH=MSP430x32
 SCRIPT_NAME=elf32msp430_3
 ROM_START=0xc000
 ROM_SIZE=0x3fe0
@@ -362,7 +362,7 @@ STACK=0x400
 fi
 
 if [ "${MSP430_NAME}" = "msp430x336" ] ; then
-ARCH=msp:33
+ARCH=MSP430x33
 SCRIPT_NAME=elf32msp430_3
 ROM_START=0xa000
 ROM_SIZE=0x5fe0
@@ -372,7 +372,7 @@ STACK=0x600
 fi
 
 if [ "${MSP430_NAME}" = "msp430x337" ] ; then
-ARCH=msp:33
+ARCH=MSP430x33
 SCRIPT_NAME=elf32msp430_3
 ROM_START=0x8000
 ROM_SIZE=0x7fe0
@@ -382,7 +382,7 @@ STACK=0x600
 fi
 
 if [ "${MSP430_NAME}" = "msp430x412" ] ; then
-ARCH=msp:41
+ARCH=MSP430x41
 ROM_START=0xf000
 ROM_SIZE=0x0fe0
 RAM_START=0x0200
@@ -391,7 +391,7 @@ STACK=0x300
 fi
 
 if [ "${MSP430_NAME}" = "msp430x413" ] ; then
-ARCH=msp:41
+ARCH=MSP430x41
 ROM_START=0xe000
 ROM_SIZE=0x1fe0
 RAM_START=0x0200
@@ -400,7 +400,7 @@ STACK=0x300
 fi
 
 if [ "${MSP430_NAME}" = "msp430x415" ] ; then
-ARCH=msp:41
+ARCH=MSP430x41
 ROM_START=0xc000
 ROM_SIZE=0x3fe0
 RAM_START=0x0200
@@ -409,7 +409,7 @@ STACK=0x400
 fi
 
 if [ "${MSP430_NAME}" = "msp430x417" ] ; then
-ARCH=msp:41
+ARCH=MSP430x41
 ROM_START=0x8000
 ROM_SIZE=0x7fe0
 RAM_START=0x0200
@@ -418,7 +418,7 @@ STACK=0x600
 fi
 
 if [ "${MSP430_NAME}" = "msp430x435" ] ; then
-ARCH=msp:43
+ARCH=MSP430x43
 ROM_START=0xc000
 ROM_SIZE=0x3fe0
 RAM_START=0x0200
@@ -427,7 +427,7 @@ STACK=0x400
 fi
 
 if [ "${MSP430_NAME}" = "msp430x436" ] ; then
-ARCH=msp:43
+ARCH=MSP430x43
 ROM_START=0xa000
 ROM_SIZE=0x5fe0
 RAM_START=0x0200
@@ -436,7 +436,7 @@ STACK=0x600
 fi
 
 if [ "${MSP430_NAME}" = "msp430x437" ] ; then
-ARCH=msp:43
+ARCH=MSP430x43
 ROM_START=0x8000
 ROM_SIZE=0x7fe0
 RAM_START=0x0200
@@ -499,7 +499,7 @@ STACK=0x600
 fi
 
 if [ "${MSP430_NAME}" = "msp430xG437" ] ; then
-ARCH=msp:43
+ARCH=MSP430x43
 ROM_START=0x8000
 ROM_SIZE=0x7fe0
 RAM_START=0x0200
@@ -508,7 +508,7 @@ STACK=0x600
 fi
 
 if [ "${MSP430_NAME}" = "msp430xG438" ] ; then
-ARCH=msp:43
+ARCH=MSP430x43
 ROM_START=0x4000
 ROM_SIZE=0xbef0
 RAM_START=0x0200
@@ -517,7 +517,7 @@ STACK=0xa00
 fi
 
 if [ "${MSP430_NAME}" = "msp430xG439" ] ; then
-ARCH=msp:43
+ARCH=MSP430x43
 ROM_START=0x1100
 ROM_SIZE=0xeee0
 RAM_START=0x0200
@@ -553,7 +553,7 @@ STACK=0x600
 fi
 
 if [ "${MSP430_NAME}" = "msp430X" ] ; then
-ARCH=msp:43
+ARCH=MSP430x43
 ROM_START=0x02000
 ROM_SIZE=0x0dfe0
 RAM_START=0x10000