Updated MCU list.

Updated MCU list to remain in synchronization with latest gcc.

3 files changed, 720 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9b8f0528e93d..d11c422f97df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Wed Dec  9 19:23:52 UTC 2015
 pkgbase = msp430-elf-binutils
-	pkgdesc = GNU binary utilities for the msp430-elf target
+	pkgdesc = GNU binary utilities for the msp430-elf target.
 	pkgver = 2.25.1
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.gnu.org/software/binutils/
 	arch = i686
 	arch = x86_64
@@ -12,8 +14,10 @@ pkgbase = msp430-elf-binutils
 	options = !buildflags
 	source = ftp://ftp.gnu.org/gnu/binutils/binutils-2.25.1.tar.bz2
 	source = bfd-fix.patch
+	source = tc-msp430.c.patch
 	sha256sums = b5b14added7d78a8d1ca70b5cb75fef57ce2197264f4f5835326b0df22ac9f22
 	sha256sums = 1b5e879dbd9da83a8c7f86abac5cf706b8ba48e3f0525d893a53c651e4015124
+	sha256sums = af639e72b33ce9a6b9f2fcb13355d27d7425f94a6fbefa3d0a377932a6786985
 
 pkgname = msp430-elf-binutils
 
diff --git a/PKGBUILD b/PKGBUILD
index 6205e45201b0..0685194614f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@ pkgname=${_target}-binutils #-git
 _pkgver=2.25.1
 pkgver=${_pkgver}
 #pkgver=2.25.r84308.c576455
-pkgrel=2
-pkgdesc="GNU binary utilities for the ${_target} target"
+pkgrel=3
+pkgdesc="GNU binary utilities for the ${_target} target."
 arch=(i686 x86_64)
 options=('!libtool' '!buildflags') 
 url='http://www.gnu.org/software/binutils/'
@@ -21,9 +21,11 @@ depends=('zlib' 'flex')
 
 # build from source
 source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2
-        bfd-fix.patch)
+        bfd-fix.patch
+        tc-msp430.c.patch)
 sha256sums=('b5b14added7d78a8d1ca70b5cb75fef57ce2197264f4f5835326b0df22ac9f22'
-            '1b5e879dbd9da83a8c7f86abac5cf706b8ba48e3f0525d893a53c651e4015124')
+            '1b5e879dbd9da83a8c7f86abac5cf706b8ba48e3f0525d893a53c651e4015124'
+            'af639e72b33ce9a6b9f2fcb13355d27d7425f94a6fbefa3d0a377932a6786985')
 
 # pkgver() {
 #   cd "${srcdir}/binutils-${_pkgver}"
@@ -36,6 +38,11 @@ prepare() {
   cd "${srcdir}/binutils-${_pkgver}"
   # https://sourceware.org/bugzilla/show_bug.cgi?id=17940
   patch -p1 < ../bfd-fix.patch
+  # update list of known MCU names
+  # https://sourceware.org/ml/binutils-cvs/2015-10/msg00074.html
+  # the list has to be in sync with gcc
+  patch -p1 < ../tc-msp430.c.patch
+
   # ensure a clean build
   [[ -d binutils-build ]] && rm -rf binutils-build
   mkdir binutils-build
diff --git a/tc-msp430.c.patch b/tc-msp430.c.patch
new file mode 100644
index 000000000000..877a03bf7b6c
--- /dev/null
+++ b/tc-msp430.c.patch
@@ -0,0 +1,703 @@
+diff -rupN binutils-2.25.1-pristine/gas/config/tc-msp430.c binutils-2.25.1-modified/gas/config/tc-msp430.c
+--- binutils-2.25.1-pristine/gas/config/tc-msp430.c	2014-11-04 04:54:41.000000000 -0500
++++ binutils-2.25.1-modified/gas/config/tc-msp430.c	2015-10-22 13:49:48.700489379 -0400
+@@ -28,6 +28,7 @@
+ #include "safe-ctype.h"
+ #include "dwarf2dbg.h"
+ #include "elf/msp430.h"
++#include "libiberty.h"
+ 
+ /* We will disable polymorphs by default because it is dangerous.
+    The potential problem here is the following: assume we got the
+@@ -692,66 +693,612 @@ msp430_set_arch (int option)
+ 		     target_is_430x () ? bfd_mach_msp430x : bfd_mach_msp11);
+ }
+ 
+-/* This is the full list of MCU names that are known to only
+-   support the 430 ISA.  */
+-static const char * msp430_mcu_names [] =
+-{
+-"msp430afe221",	"msp430afe222",	"msp430afe223",	"msp430afe231",	
+-"msp430afe232",	"msp430afe233",	"msp430afe251",	"msp430afe252",	
+-"msp430afe253",	"msp430c091",	"msp430c092",	"msp430c111",	
+-"msp430c1111",	"msp430c112",	"msp430c1121",	"msp430c1331",	
+-"msp430c1351",	"msp430c311s",	"msp430c312",	"msp430c313",	
+-"msp430c314",	"msp430c315",	"msp430c323",	"msp430c325",	
+-"msp430c336",	"msp430c337",	"msp430c412",	"msp430c413",	
+-"msp430e112",	"msp430e313",	"msp430e315",	"msp430e325",	
+-"msp430e337",	"msp430f110",	"msp430f1101",	"msp430f1101a",	
+-"msp430f1111",	"msp430f1111a",	"msp430f112",	"msp430f1121",	
+-"msp430f1121a",	"msp430f1122",	"msp430f1132",	"msp430f122",	
+-"msp430f1222",	"msp430f123",	"msp430f1232",	"msp430f133",	
+-"msp430f135",	"msp430f147",	"msp430f1471",	"msp430f148",	
+-"msp430f1481",	"msp430f149",	"msp430f1491",	"msp430f155",	
+-"msp430f156",	"msp430f157",	"msp430f1610",	"msp430f1611",	
+-"msp430f1612",	"msp430f167",	"msp430f168",	"msp430f169",	
+-"msp430f2001",	"msp430f2002",	"msp430f2003",	"msp430f2011",	
+-"msp430f2012",	"msp430f2013",	"msp430f2101",	"msp430f2111",	
+-"msp430f2112",	"msp430f2121",	"msp430f2122",	"msp430f2131",	
+-"msp430f2132",	"msp430f2232",	"msp430f2234",	"msp430f2252",	
+-"msp430f2254",	"msp430f2272",	"msp430f2274",	"msp430f233",	
+-"msp430f2330",	"msp430f235",	"msp430f2350",	"msp430f2370",	
+-"msp430f2410",	"msp430f247",	"msp430f2471",	"msp430f248",	
+-"msp430f2481",	"msp430f249",	"msp430f2491",	"msp430f412",	
+-"msp430f413",	"msp430f4132",	"msp430f415",	"msp430f4152",	
+-"msp430f417",	"msp430f423",	"msp430f423a",	"msp430f425",	
+-"msp430f4250",	"msp430f425a",	"msp430f4260",	"msp430f427",	
+-"msp430f4270",	"msp430f427a",	"msp430f435",	"msp430f4351",	
+-"msp430f436",	"msp430f4361",	"msp430f437",	"msp430f4371",	
+-"msp430f438",	"msp430f439",	"msp430f447",	"msp430f448",	
+-"msp430f4481",	"msp430f449",	"msp430f4491",	"msp430f477",	
+-"msp430f478",	"msp430f4783",	"msp430f4784",	"msp430f479",	
+-"msp430f4793",	"msp430f4794",	"msp430fe423",	"msp430fe4232",	
+-"msp430fe423a",	"msp430fe4242",	"msp430fe425",	"msp430fe4252",	
+-"msp430fe425a",	"msp430fe427",	"msp430fe4272",	"msp430fe427a",	
+-"msp430fg4250",	"msp430fg4260",	"msp430fg4270",	"msp430fg437",	
+-"msp430fg438",	"msp430fg439",	"msp430fg477",	"msp430fg478",	
+-"msp430fg479",	"msp430fw423",	"msp430fw425",	"msp430fw427",	
+-"msp430fw428",	"msp430fw429",	"msp430g2001",	"msp430g2101",	
+-"msp430g2102",	"msp430g2111",	"msp430g2112",	"msp430g2113",	
+-"msp430g2121",	"msp430g2131",	"msp430g2132",	"msp430g2152",	
+-"msp430g2153",	"msp430g2201",	"msp430g2202",	"msp430g2203",	
+-"msp430g2210",	"msp430g2211",	"msp430g2212",	"msp430g2213",	
+-"msp430g2221",	"msp430g2230",	"msp430g2231",	"msp430g2232",	
+-"msp430g2233",	"msp430g2252",	"msp430g2253",	"msp430g2302",	
+-"msp430g2303",	"msp430g2312",	"msp430g2313",	"msp430g2332",	
+-"msp430g2333",	"msp430g2352",	"msp430g2353",	"msp430g2402",	
+-"msp430g2403",	"msp430g2412",	"msp430g2413",	"msp430g2432",	
+-"msp430g2433",	"msp430g2444",	"msp430g2452",	"msp430g2453",	
+-"msp430g2513",	"msp430g2533",	"msp430g2544",	"msp430g2553",	
+-"msp430g2744",	"msp430g2755",	"msp430g2855",	"msp430g2955",	
+-"msp430i2020",	"msp430i2021",	"msp430i2030",	"msp430i2031",	
+-"msp430i2040",	"msp430i2041",	"msp430l092",   "msp430p112",	
+-"msp430p313",	"msp430p315",	"msp430p315s",	"msp430p325",	
+-"msp430p337",	"msp430tch5e"
+-};
++/* This is a copy of the same data structure found in gcc/config/msp430/msp430.c
++   Keep these two structures in sync.
++   The data in this structure has been extracted from the devices.csv file
++   released by TI, updated as of 8 October 2015.  */
++
++struct msp430_mcu_data
++{
++  const char * name;
++  unsigned int revision; /* 0=> MSP430, 1=>MSP430X, 2=> MSP430Xv2.  */
++  unsigned int hwmpy;    /* 0=>none, 1=>16-bit, 2=>16-bit w/sign extend, 4=>32-bit, 8=> 32-bit (5xx).  */
++}
++msp430_mcu_data [] =
++{
++  { "cc430f5123",2,8 },
++  { "cc430f5125",2,8 },
++  { "cc430f5133",2,8 },
++  { "cc430f5135",2,8 },
++  { "cc430f5137",2,8 },
++  { "cc430f5143",2,8 },
++  { "cc430f5145",2,8 },
++  { "cc430f5147",2,8 },
++  { "cc430f6125",2,8 },
++  { "cc430f6126",2,8 },
++  { "cc430f6127",2,8 },
++  { "cc430f6135",2,8 },
++  { "cc430f6137",2,8 },
++  { "cc430f6143",2,8 },
++  { "cc430f6145",2,8 },
++  { "cc430f6147",2,8 },
++  { "msp430afe221",0,2 },
++  { "msp430afe222",0,2 },
++  { "msp430afe223",0,2 },
++  { "msp430afe231",0,2 },
++  { "msp430afe232",0,2 },
++  { "msp430afe233",0,2 },
++  { "msp430afe251",0,2 },
++  { "msp430afe252",0,2 },
++  { "msp430afe253",0,2 },
++  { "msp430bt5190",2,8 },
++  { "msp430c091",0,0 },
++  { "msp430c092",0,0 },
++  { "msp430c111",0,0 },
++  { "msp430c1111",0,0 },
++  { "msp430c112",0,0 },
++  { "msp430c1121",0,0 },
++  { "msp430c1331",0,0 },
++  { "msp430c1351",0,0 },
++  { "msp430c311s",0,0 },
++  { "msp430c312",0,0 },
++  { "msp430c313",0,0 },
++  { "msp430c314",0,0 },
++  { "msp430c315",0,0 },
++  { "msp430c323",0,0 },
++  { "msp430c325",0,0 },
++  { "msp430c336",0,1 },
++  { "msp430c337",0,1 },
++  { "msp430c412",0,0 },
++  { "msp430c413",0,0 },
++  { "msp430cg4616",1,1 },
++  { "msp430cg4617",1,1 },
++  { "msp430cg4618",1,1 },
++  { "msp430cg4619",1,1 },
++  { "msp430e112",0,0 },
++  { "msp430e313",0,0 },
++  { "msp430e315",0,0 },
++  { "msp430e325",0,0 },
++  { "msp430e337",0,1 },
++  { "msp430f110",0,0 },
++  { "msp430f1101",0,0 },
++  { "msp430f1101a",0,0 },
++  { "msp430f1111",0,0 },
++  { "msp430f1111a",0,0 },
++  { "msp430f112",0,0 },
++  { "msp430f1121",0,0 },
++  { "msp430f1121a",0,0 },
++  { "msp430f1122",0,0 },
++  { "msp430f1132",0,0 },
++  { "msp430f122",0,0 },
++  { "msp430f1222",0,0 },
++  { "msp430f123",0,0 },
++  { "msp430f1232",0,0 },
++  { "msp430f133",0,0 },
++  { "msp430f135",0,0 },
++  { "msp430f147",0,1 },
++  { "msp430f1471",0,1 },
++  { "msp430f148",0,1 },
++  { "msp430f1481",0,1 },
++  { "msp430f149",0,1 },
++  { "msp430f1491",0,1 },
++  { "msp430f155",0,0 },
++  { "msp430f156",0,0 },
++  { "msp430f157",0,0 },
++  { "msp430f1610",0,1 },
++  { "msp430f1611",0,1 },
++  { "msp430f1612",0,1 },
++  { "msp430f167",0,1 },
++  { "msp430f168",0,1 },
++  { "msp430f169",0,1 },
++  { "msp430f2001",0,0 },
++  { "msp430f2002",0,0 },
++  { "msp430f2003",0,0 },
++  { "msp430f2011",0,0 },
++  { "msp430f2012",0,0 },
++  { "msp430f2013",0,0 },
++  { "msp430f2101",0,0 },
++  { "msp430f2111",0,0 },
++  { "msp430f2112",0,0 },
++  { "msp430f2121",0,0 },
++  { "msp430f2122",0,0 },
++  { "msp430f2131",0,0 },
++  { "msp430f2132",0,0 },
++  { "msp430f2232",0,0 },
++  { "msp430f2234",0,0 },
++  { "msp430f2252",0,0 },
++  { "msp430f2254",0,0 },
++  { "msp430f2272",0,0 },
++  { "msp430f2274",0,0 },
++  { "msp430f233",0,2 },
++  { "msp430f2330",0,2 },
++  { "msp430f235",0,2 },
++  { "msp430f2350",0,2 },
++  { "msp430f2370",0,2 },
++  { "msp430f2410",0,2 },
++  { "msp430f2416",1,2 },
++  { "msp430f2417",1,2 },
++  { "msp430f2418",1,2 },
++  { "msp430f2419",1,2 },
++  { "msp430f247",0,2 },
++  { "msp430f2471",0,2 },
++  { "msp430f248",0,2 },
++  { "msp430f2481",0,2 },
++  { "msp430f249",0,2 },
++  { "msp430f2491",0,2 },
++  { "msp430f2616",1,2 },
++  { "msp430f2617",1,2 },
++  { "msp430f2618",1,2 },
++  { "msp430f2619",1,2 },
++  { "msp430f412",0,0 },
++  { "msp430f413",0,0 },
++  { "msp430f4132",0,0 },
++  { "msp430f415",0,0 },
++  { "msp430f4152",0,0 },
++  { "msp430f417",0,0 },
++  { "msp430f423",0,1 },
++  { "msp430f423a",0,1 },
++  { "msp430f425",0,1 },
++  { "msp430f4250",0,0 },
++  { "msp430f425a",0,1 },
++  { "msp430f4260",0,0 },
++  { "msp430f427",0,1 },
++  { "msp430f4270",0,0 },
++  { "msp430f427a",0,1 },
++  { "msp430f435",0,0 },
++  { "msp430f4351",0,0 },
++  { "msp430f436",0,0 },
++  { "msp430f4361",0,0 },
++  { "msp430f437",0,0 },
++  { "msp430f4371",0,0 },
++  { "msp430f438",0,0 },
++  { "msp430f439",0,0 },
++  { "msp430f447",0,1 },
++  { "msp430f448",0,1 },
++  { "msp430f4481",0,1 },
++  { "msp430f449",0,1 },
++  { "msp430f4491",0,1 },
++  { "msp430f4616",1,1 },
++  { "msp430f46161",1,1 },
++  { "msp430f4617",1,1 },
++  { "msp430f46171",1,1 },
++  { "msp430f4618",1,1 },
++  { "msp430f46181",1,1 },
++  { "msp430f4619",1,1 },
++  { "msp430f46191",1,1 },
++  { "msp430f47126",1,4 },
++  { "msp430f47127",1,4 },
++  { "msp430f47163",1,4 },
++  { "msp430f47166",1,4 },
++  { "msp430f47167",1,4 },
++  { "msp430f47173",1,4 },
++  { "msp430f47176",1,4 },
++  { "msp430f47177",1,4 },
++  { "msp430f47183",1,4 },
++  { "msp430f47186",1,4 },
++  { "msp430f47187",1,4 },
++  { "msp430f47193",1,4 },
++  { "msp430f47196",1,4 },
++  { "msp430f47197",1,4 },
++  { "msp430f477",0,0 },
++  { "msp430f478",0,0 },
++  { "msp430f4783",0,4 },
++  { "msp430f4784",0,4 },
++  { "msp430f479",0,0 },
++  { "msp430f4793",0,4 },
++  { "msp430f4794",0,4 },
++  { "msp430f5131",2,8 },
++  { "msp430f5132",2,8 },
++  { "msp430f5151",2,8 },
++  { "msp430f5152",2,8 },
++  { "msp430f5171",2,8 },
++  { "msp430f5172",2,8 },
++  { "msp430f5212",2,8 },
++  { "msp430f5213",2,8 },
++  { "msp430f5214",2,8 },
++  { "msp430f5217",2,8 },
++  { "msp430f5218",2,8 },
++  { "msp430f5219",2,8 },
++  { "msp430f5222",2,8 },
++  { "msp430f5223",2,8 },
++  { "msp430f5224",2,8 },
++  { "msp430f5227",2,8 },
++  { "msp430f5228",2,8 },
++  { "msp430f5229",2,8 },
++  { "msp430f5232",2,8 },
++  { "msp430f5234",2,8 },
++  { "msp430f5237",2,8 },
++  { "msp430f5239",2,8 },
++  { "msp430f5242",2,8 },
++  { "msp430f5244",2,8 },
++  { "msp430f5247",2,8 },
++  { "msp430f5249",2,8 },
++  { "msp430f5252",2,8 },
++  { "msp430f5253",2,8 },
++  { "msp430f5254",2,8 },
++  { "msp430f5255",2,8 },
++  { "msp430f5256",2,8 },
++  { "msp430f5257",2,8 },
++  { "msp430f5258",2,8 },
++  { "msp430f5259",2,8 },
++  { "msp430f5304",2,8 },
++  { "msp430f5308",2,8 },
++  { "msp430f5309",2,8 },
++  { "msp430f5310",2,8 },
++  { "msp430f5324",2,8 },
++  { "msp430f5325",2,8 },
++  { "msp430f5326",2,8 },
++  { "msp430f5327",2,8 },
++  { "msp430f5328",2,8 },
++  { "msp430f5329",2,8 },
++  { "msp430f5333",2,8 },
++  { "msp430f5335",2,8 },
++  { "msp430f5336",2,8 },
++  { "msp430f5338",2,8 },
++  { "msp430f5340",2,8 },
++  { "msp430f5341",2,8 },
++  { "msp430f5342",2,8 },
++  { "msp430f5358",2,8 },
++  { "msp430f5359",2,8 },
++  { "msp430f5418",2,8 },
++  { "msp430f5418a",2,8 },
++  { "msp430f5419",2,8 },
++  { "msp430f5419a",2,8 },
++  { "msp430f5435",2,8 },
++  { "msp430f5435a",2,8 },
++  { "msp430f5436",2,8 },
++  { "msp430f5436a",2,8 },
++  { "msp430f5437",2,8 },
++  { "msp430f5437a",2,8 },
++  { "msp430f5438",2,8 },
++  { "msp430f5438a",2,8 },
++  { "msp430f5500",2,8 },
++  { "msp430f5501",2,8 },
++  { "msp430f5502",2,8 },
++  { "msp430f5503",2,8 },
++  { "msp430f5504",2,8 },
++  { "msp430f5505",2,8 },
++  { "msp430f5506",2,8 },
++  { "msp430f5507",2,8 },
++  { "msp430f5508",2,8 },
++  { "msp430f5509",2,8 },
++  { "msp430f5510",2,8 },
++  { "msp430f5513",2,8 },
++  { "msp430f5514",2,8 },
++  { "msp430f5515",2,8 },
++  { "msp430f5517",2,8 },
++  { "msp430f5519",2,8 },
++  { "msp430f5521",2,8 },
++  { "msp430f5522",2,8 },
++  { "msp430f5524",2,8 },
++  { "msp430f5525",2,8 },
++  { "msp430f5526",2,8 },
++  { "msp430f5527",2,8 },
++  { "msp430f5528",2,8 },
++  { "msp430f5529",2,8 },
++  { "msp430f5630",2,8 },
++  { "msp430f5631",2,8 },
++  { "msp430f5632",2,8 },
++  { "msp430f5633",2,8 },
++  { "msp430f5634",2,8 },
++  { "msp430f5635",2,8 },
++  { "msp430f5636",2,8 },
++  { "msp430f5637",2,8 },
++  { "msp430f5638",2,8 },
++  { "msp430f5658",2,8 },
++  { "msp430f5659",2,8 },
++  { "msp430f5xx_6xxgeneric",2,8 },
++  { "msp430f6433",2,8 },
++  { "msp430f6435",2,8 },
++  { "msp430f6436",2,8 },
++  { "msp430f6438",2,8 },
++  { "msp430f6458",2,8 },
++  { "msp430f6459",2,8 },
++  { "msp430f6630",2,8 },
++  { "msp430f6631",2,8 },
++  { "msp430f6632",2,8 },
++  { "msp430f6633",2,8 },
++  { "msp430f6634",2,8 },
++  { "msp430f6635",2,8 },
++  { "msp430f6636",2,8 },
++  { "msp430f6637",2,8 },
++  { "msp430f6638",2,8 },
++  { "msp430f6658",2,8 },
++  { "msp430f6659",2,8 },
++  { "msp430f6720",2,8 },
++  { "msp430f6720a",2,8 },
++  { "msp430f6721",2,8 },
++  { "msp430f6721a",2,8 },
++  { "msp430f6723",2,8 },
++  { "msp430f6723a",2,8 },
++  { "msp430f6724",2,8 },
++  { "msp430f6724a",2,8 },
++  { "msp430f6725",2,8 },
++  { "msp430f6725a",2,8 },
++  { "msp430f6726",2,8 },
++  { "msp430f6726a",2,8 },
++  { "msp430f6730",2,8 },
++  { "msp430f6730a",2,8 },
++  { "msp430f6731",2,8 },
++  { "msp430f6731a",2,8 },
++  { "msp430f6733",2,8 },
++  { "msp430f6733a",2,8 },
++  { "msp430f6734",2,8 },
++  { "msp430f6734a",2,8 },
++  { "msp430f6735",2,8 },
++  { "msp430f6735a",2,8 },
++  { "msp430f6736",2,8 },
++  { "msp430f6736a",2,8 },
++  { "msp430f6745",2,8 },
++  { "msp430f67451",2,8 },
++  { "msp430f67451a",2,8 },
++  { "msp430f6745a",2,8 },
++  { "msp430f6746",2,8 },
++  { "msp430f67461",2,8 },
++  { "msp430f67461a",2,8 },
++  { "msp430f6746a",2,8 },
++  { "msp430f6747",2,8 },
++  { "msp430f67471",2,8 },
++  { "msp430f67471a",2,8 },
++  { "msp430f6747a",2,8 },
++  { "msp430f6748",2,8 },
++  { "msp430f67481",2,8 },
++  { "msp430f67481a",2,8 },
++  { "msp430f6748a",2,8 },
++  { "msp430f6749",2,8 },
++  { "msp430f67491",2,8 },
++  { "msp430f67491a",2,8 },
++  { "msp430f6749a",2,8 },
++  { "msp430f67621",2,8 },
++  { "msp430f67621a",2,8 },
++  { "msp430f67641",2,8 },
++  { "msp430f67641a",2,8 },
++  { "msp430f6765",2,8 },
++  { "msp430f67651",2,8 },
++  { "msp430f67651a",2,8 },
++  { "msp430f6765a",2,8 },
++  { "msp430f6766",2,8 },
++  { "msp430f67661",2,8 },
++  { "msp430f67661a",2,8 },
++  { "msp430f6766a",2,8 },
++  { "msp430f6767",2,8 },
++  { "msp430f67671",2,8 },
++  { "msp430f67671a",2,8 },
++  { "msp430f6767a",2,8 },
++  { "msp430f6768",2,8 },
++  { "msp430f67681",2,8 },
++  { "msp430f67681a",2,8 },
++  { "msp430f6768a",2,8 },
++  { "msp430f6769",2,8 },
++  { "msp430f67691",2,8 },
++  { "msp430f67691a",2,8 },
++  { "msp430f6769a",2,8 },
++  { "msp430f6775",2,8 },
++  { "msp430f67751",2,8 },
++  { "msp430f67751a",2,8 },
++  { "msp430f6775a",2,8 },
++  { "msp430f6776",2,8 },
++  { "msp430f67761",2,8 },
++  { "msp430f67761a",2,8 },
++  { "msp430f6776a",2,8 },
++  { "msp430f6777",2,8 },
++  { "msp430f67771",2,8 },
++  { "msp430f67771a",2,8 },
++  { "msp430f6777a",2,8 },
++  { "msp430f6778",2,8 },
++  { "msp430f67781",2,8 },
++  { "msp430f67781a",2,8 },
++  { "msp430f6778a",2,8 },
++  { "msp430f6779",2,8 },
++  { "msp430f67791",2,8 },
++  { "msp430f67791a",2,8 },
++  { "msp430f6779a",2,8 },
++  { "msp430fe423",0,0 },
++  { "msp430fe4232",0,0 },
++  { "msp430fe423a",0,0 },
++  { "msp430fe4242",0,0 },
++  { "msp430fe425",0,0 },
++  { "msp430fe4252",0,0 },
++  { "msp430fe425a",0,0 },
++  { "msp430fe427",0,0 },
++  { "msp430fe4272",0,0 },
++  { "msp430fe427a",0,0 },
++  { "msp430fg4250",0,0 },
++  { "msp430fg4260",0,0 },
++  { "msp430fg4270",0,0 },
++  { "msp430fg437",0,0 },
++  { "msp430fg438",0,0 },
++  { "msp430fg439",0,0 },
++  { "msp430fg4616",1,1 },
++  { "msp430fg4617",1,1 },
++  { "msp430fg4618",1,1 },
++  { "msp430fg4619",1,1 },
++  { "msp430fg477",0,0 },
++  { "msp430fg478",0,0 },
++  { "msp430fg479",0,0 },
++  { "msp430fg6425",2,8 },
++  { "msp430fg6426",2,8 },
++  { "msp430fg6625",2,8 },
++  { "msp430fg6626",2,8 },
++  { "msp430fr2032",2,0 },
++  { "msp430fr2033",2,0 },
++  { "msp430fr2433",2,8 },
++  { "msp430fr2xx_4xxgeneric",2,8 },
++  { "msp430fr4131",2,0 },
++  { "msp430fr4132",2,0 },
++  { "msp430fr4133",2,0 },
++  { "msp430fr5720",2,8 },
++  { "msp430fr5721",2,8 },
++  { "msp430fr5722",2,8 },
++  { "msp430fr5723",2,8 },
++  { "msp430fr5724",2,8 },
++  { "msp430fr5725",2,8 },
++  { "msp430fr5726",2,8 },
++  { "msp430fr5727",2,8 },
++  { "msp430fr5728",2,8 },
++  { "msp430fr5729",2,8 },
++  { "msp430fr5730",2,8 },
++  { "msp430fr5731",2,8 },
++  { "msp430fr5732",2,8 },
++  { "msp430fr5733",2,8 },
++  { "msp430fr5734",2,8 },
++  { "msp430fr5735",2,8 },
++  { "msp430fr5736",2,8 },
++  { "msp430fr5737",2,8 },
++  { "msp430fr5738",2,8 },
++  { "msp430fr5739",2,8 },
++  { "msp430fr57xxgeneric",2,8 },
++  { "msp430fr5847",2,8 },
++  { "msp430fr58471",2,8 },
++  { "msp430fr5848",2,8 },
++  { "msp430fr5849",2,8 },
++  { "msp430fr5857",2,8 },
++  { "msp430fr5858",2,8 },
++  { "msp430fr5859",2,8 },
++  { "msp430fr5867",2,8 },
++  { "msp430fr58671",2,8 },
++  { "msp430fr5868",2,8 },
++  { "msp430fr5869",2,8 },
++  { "msp430fr5870",2,8 },
++  { "msp430fr5872",2,8 },
++  { "msp430fr58721",2,8 },
++  { "msp430fr5887",2,8 },
++  { "msp430fr5888",2,8 },
++  { "msp430fr5889",2,8 },
++  { "msp430fr58891",2,8 },
++  { "msp430fr5922",2,8 },
++  { "msp430fr59221",2,8 },
++  { "msp430fr5947",2,8 },
++  { "msp430fr59471",2,8 },
++  { "msp430fr5948",2,8 },
++  { "msp430fr5949",2,8 },
++  { "msp430fr5957",2,8 },
++  { "msp430fr5958",2,8 },
++  { "msp430fr5959",2,8 },
++  { "msp430fr5967",2,8 },
++  { "msp430fr5968",2,8 },
++  { "msp430fr5969",2,8 },
++  { "msp430fr59691",2,8 },
++  { "msp430fr5970",2,8 },
++  { "msp430fr5972",2,8 },
++  { "msp430fr59721",2,8 },
++  { "msp430fr5986",2,8 },
++  { "msp430fr5987",2,8 },
++  { "msp430fr5988",2,8 },
++  { "msp430fr5989",2,8 },
++  { "msp430fr59891",2,8 },
++  { "msp430fr5xx_6xxgeneric",2,8 },
++  { "msp430fr6820",2,8 },
++  { "msp430fr6822",2,8 },
++  { "msp430fr68221",2,8 },
++  { "msp430fr6870",2,8 },
++  { "msp430fr6872",2,8 },
++  { "msp430fr68721",2,8 },
++  { "msp430fr6877",2,8 },
++  { "msp430fr6879",2,8 },
++  { "msp430fr68791",2,8 },
++  { "msp430fr6887",2,8 },
++  { "msp430fr6888",2,8 },
++  { "msp430fr6889",2,8 },
++  { "msp430fr68891",2,8 },
++  { "msp430fr6920",2,8 },
++  { "msp430fr6922",2,8 },
++  { "msp430fr69221",2,8 },
++  { "msp430fr6927",2,8 },
++  { "msp430fr69271",2,8 },
++  { "msp430fr6928",2,8 },
++  { "msp430fr6970",2,8 },
++  { "msp430fr6972",2,8 },
++  { "msp430fr69721",2,8 },
++  { "msp430fr6977",2,8 },
++  { "msp430fr6979",2,8 },
++  { "msp430fr69791",2,8 },
++  { "msp430fr6987",2,8 },
++  { "msp430fr6988",2,8 },
++  { "msp430fr6989",2,8 },
++  { "msp430fr69891",2,8 },
++  { "msp430fw423",0,0 },
++  { "msp430fw425",0,0 },
++  { "msp430fw427",0,0 },
++  { "msp430fw428",0,0 },
++  { "msp430fw429",0,0 },
++  { "msp430g2001",0,0 },
++  { "msp430g2101",0,0 },
++  { "msp430g2102",0,0 },
++  { "msp430g2111",0,0 },
++  { "msp430g2112",0,0 },
++  { "msp430g2113",0,0 },
++  { "msp430g2121",0,0 },
++  { "msp430g2131",0,0 },
++  { "msp430g2132",0,0 },
++  { "msp430g2152",0,0 },
++  { "msp430g2153",0,0 },
++  { "msp430g2201",0,0 },
++  { "msp430g2202",0,0 },
++  { "msp430g2203",0,0 },
++  { "msp430g2210",0,0 },
++  { "msp430g2211",0,0 },
++  { "msp430g2212",0,0 },
++  { "msp430g2213",0,0 },
++  { "msp430g2221",0,0 },
++  { "msp430g2230",0,0 },
++  { "msp430g2231",0,0 },
++  { "msp430g2232",0,0 },
++  { "msp430g2233",0,0 },
++  { "msp430g2252",0,0 },
++  { "msp430g2253",0,0 },
++  { "msp430g2302",0,0 },
++  { "msp430g2303",0,0 },
++  { "msp430g2312",0,0 },
++  { "msp430g2313",0,0 },
++  { "msp430g2332",0,0 },
++  { "msp430g2333",0,0 },
++  { "msp430g2352",0,0 },
++  { "msp430g2353",0,0 },
++  { "msp430g2402",0,0 },
++  { "msp430g2403",0,0 },
++  { "msp430g2412",0,0 },
++  { "msp430g2413",0,0 },
++  { "msp430g2432",0,0 },
++  { "msp430g2433",0,0 },
++  { "msp430g2444",0,0 },
++  { "msp430g2452",0,0 },
++  { "msp430g2453",0,0 },
++  { "msp430g2513",0,0 },
++  { "msp430g2533",0,0 },
++  { "msp430g2544",0,0 },
++  { "msp430g2553",0,0 },
++  { "msp430g2744",0,0 },
++  { "msp430g2755",0,0 },
++  { "msp430g2855",0,0 },
++  { "msp430g2955",0,0 },
++  { "msp430i2020",0,2 },
++  { "msp430i2021",0,2 },
++  { "msp430i2030",0,2 },
++  { "msp430i2031",0,2 },
++  { "msp430i2040",0,2 },
++  { "msp430i2041",0,2 },
++  { "msp430i2xxgeneric",0,2 },
++  { "msp430l092",0,0 },
++  { "msp430p112",0,0 },
++  { "msp430p313",0,0 },
++  { "msp430p315",0,0 },
++  { "msp430p315s",0,0 },
++  { "msp430p325",0,0 },
++  { "msp430p337",0,1 },
++  { "msp430sl5438a",2,8 },
++  { "msp430tch5e",0,0 },
++  { "msp430xgeneric",2,8 },
++  { "rf430f5144",2,8 },
++  { "rf430f5155",2,8 },
++  { "rf430f5175",2,8 },
++  { "rf430frl152h",0,0 },
++  { "rf430frl152h_rom",0,0 },
++  { "rf430frl153h",0,0 },
++  { "rf430frl153h_rom",0,0 },
++  { "rf430frl154h",0,0 },
++  { "rf430frl154h_rom",0,0 }
++};  
+ 
+ int
+ md_parse_option (int c, char * arg)
+@@ -772,10 +1319,15 @@ md_parse_option (int c, char * arg)
+ 	{
+ 	  int i;
+ 
+-	  for (i = sizeof msp430_mcu_names / sizeof msp430_mcu_names[0]; i--;)
+-	    if (strcasecmp (msp430_mcu_names[i], arg) == 0)
++	  for (i = ARRAY_SIZE (msp430_mcu_data); i--;)
++	    if (strcasecmp (msp430_mcu_data[i].name, arg) == 0)
+ 	      {
+-		selected_isa = MSP_ISA_430;
++		switch (msp430_mcu_data[i].revision)
++		  {
++		  case 0: selected_isa = MSP_ISA_430; break;
++		  case 1: selected_isa = MSP_ISA_430X; break;
++		  case 2: selected_isa = MSP_ISA_430Xv2; break;
++		  }
+ 		break;
+ 	    }
+ 	}