Sync device list.

Sync device list with binutils.

3 files changed, 113 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3a210cb18d01..4a791c08eed0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Jan  8 21:07:24 UTC 2017
+# Mon Mar  6 19:13:19 UTC 2017
 pkgbase = msp430-elf-gcc
 	pkgdesc = The GNU Compiler Collection for the msp430-elf target.
 	pkgver = 6.3.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://gcc.gnu.org
 	arch = i686
 	arch = x86_64
@@ -26,9 +26,11 @@ pkgbase = msp430-elf-gcc
 	source = ftp://gcc.gnu.org/pub/gcc/releases/gcc-6.3.0/gcc-6.3.0.tar.bz2
 	source = http://isl.gforge.inria.fr/isl-0.18.tar.bz2
 	source = fix-insn-delay_cycles_32x.patch
+	source = sync-devicelist.patch
 	sha256sums = f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f
 	sha256sums = 6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b
 	sha256sums = 0cd87771d1fd8ec5d0c413ae8c18b9b2599f2c66a0fa8b5fd4aa2f01ac1b5f86
+	sha256sums = c9fdb1ac5f86dcbde673c0aed448a5e61d706fc4cbfa417f91be95e292cb5c26
 
 pkgname = msp430-elf-gcc
 
diff --git a/PKGBUILD b/PKGBUILD
index ff022f12c884..faaef53e3258 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _target="msp430-elf"
 pkgname=${_target}-gcc
 pkgver=6.3.0
 _islver=0.18
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNU Compiler Collection for the ${_target} target."
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
@@ -16,16 +16,21 @@ replaces=("${_target}-gcc-stage1")
 provides=("${_target}-gcc-stage1")
 source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
         http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2
-        fix-insn-delay_cycles_32x.patch)
+        fix-insn-delay_cycles_32x.patch
+        sync-devicelist.patch)
 sha256sums=('f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f'
             '6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b'
-            '0cd87771d1fd8ec5d0c413ae8c18b9b2599f2c66a0fa8b5fd4aa2f01ac1b5f86')
+            '0cd87771d1fd8ec5d0c413ae8c18b9b2599f2c66a0fa8b5fd4aa2f01ac1b5f86'
+            'c9fdb1ac5f86dcbde673c0aed448a5e61d706fc4cbfa417f91be95e292cb5c26')
 
 prepare() {
   cd "${srcdir}/gcc-${pkgver}"
   [[ -L isl ]] && rm -f isl
   ln -s ../isl-${_islver} isl
 
+  # synchronize device list with binutils
+  patch -p1 < ../sync-devicelist.patch
+
   # this did not make it into 6.3.0
   patch -p1 < ../fix-insn-delay_cycles_32x.patch
 
diff --git a/sync-devicelist.patch b/sync-devicelist.patch
new file mode 100644
index 000000000000..422beaf9da53
--- /dev/null
+++ b/sync-devicelist.patch
@@ -0,0 +1,101 @@
+diff --git a/gcc/config/msp430/driver-msp430.c b/gcc/config/msp430/driver-msp430.c
+index 69b7a73..b6b5676 100644
+--- a/gcc/config/msp430/driver-msp430.c
++++ b/gcc/config/msp430/driver-msp430.c
+@@ -27,8 +27,8 @@
+ /* This is a copy of the same data structure found in gas/config/tc-msp430.c
+    Also another (sort-of) copy can be found in gcc/config/msp430/msp430.c
+    Keep these three 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.  */
++   The data in this structure has been extracted from version 1.194 of the
++   devices.csv file released by TI in September 2016.  */
+ 
+ struct msp430_mcu_data
+ {
+@@ -454,7 +454,15 @@ msp430_mcu_data [] =
+   { "msp430fg6626",2,8 },
+   { "msp430fr2032",2,0 },
+   { "msp430fr2033",2,0 },
++  { "msp430fr2110",2,0 },
++  { "msp430fr2111",2,0 },
++  { "msp430fr2310",2,0 },
++  { "msp430fr2311",2,0 },
+   { "msp430fr2433",2,8 },
++  { "msp430fr2532",2,8 },
++  { "msp430fr2533",2,8 },
++  { "msp430fr2632",2,8 },
++  { "msp430fr2633",2,8 },
+   { "msp430fr2xx_4xxgeneric",2,8 },
+   { "msp430fr4131",2,0 },
+   { "msp430fr4132",2,0 },
+@@ -507,6 +515,8 @@ msp430_mcu_data [] =
+   { "msp430fr5957",2,8 },
+   { "msp430fr5958",2,8 },
+   { "msp430fr5959",2,8 },
++  { "msp430fr5962",2,8 },
++  { "msp430fr5964",2,8 },
+   { "msp430fr5967",2,8 },
+   { "msp430fr5968",2,8 },
+   { "msp430fr5969",2,8 },
+@@ -519,6 +529,9 @@ msp430_mcu_data [] =
+   { "msp430fr5988",2,8 },
+   { "msp430fr5989",2,8 },
+   { "msp430fr59891",2,8 },
++  { "msp430fr5992",2,8 },
++  { "msp430fr5994",2,8 },
++  { "msp430fr59941",2,8 },
+   { "msp430fr5xx_6xxgeneric",2,8 },
+   { "msp430fr6820",2,8 },
+   { "msp430fr6822",2,8 },
+diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c
+index fb1978b..fe92370 100644
+--- a/gcc/config/msp430/msp430.c
++++ b/gcc/config/msp430/msp430.c
+@@ -93,8 +93,8 @@ msp430_init_machine_status (void)
+ /* This is a copy of the same data structure found in gas/config/tc-msp430.c
+    Also another (sort-of) copy can be found in gcc/config/msp430/t-msp430
+    Keep these three structures in sync.
+-   The data in this structure has been extracted from the devices.csv file
+-   released by TI, updated as of March 2016.  */
++   The data in this structure has been extracted from version 1.194 of the
++   devices.csv file released by TI in September 2016.  */
+ 
+ struct msp430_mcu_data
+ {
+@@ -520,6 +520,8 @@ msp430_mcu_data [] =
+   { "msp430fg6626",2,8 },
+   { "msp430fr2032",2,0 },
+   { "msp430fr2033",2,0 },
++  { "msp430fr2110",2,0 },
++  { "msp430fr2111",2,0 },
+   { "msp430fr2310",2,0 },
+   { "msp430fr2311",2,0 },
+   { "msp430fr2433",2,8 },
+@@ -560,8 +562,6 @@ msp430_mcu_data [] =
+   { "msp430fr5858",2,8 },
+   { "msp430fr5859",2,8 },
+   { "msp430fr5867",2,8 },
+-  { "msp430fr5862",2,8 },
+-  { "msp430fr5864",2,8 },
+   { "msp430fr58671",2,8 },
+   { "msp430fr5868",2,8 },
+   { "msp430fr5869",2,8 },
+@@ -572,8 +572,6 @@ msp430_mcu_data [] =
+   { "msp430fr5888",2,8 },
+   { "msp430fr5889",2,8 },
+   { "msp430fr58891",2,8 },
+-  { "msp430fr5892",2,8 },
+-  { "msp430fr5894",2,8 },
+   { "msp430fr5922",2,8 },
+   { "msp430fr59221",2,8 },
+   { "msp430fr5947",2,8 },
+@@ -599,6 +597,7 @@ msp430_mcu_data [] =
+   { "msp430fr59891",2,8 },
+   { "msp430fr5992",2,8 },
+   { "msp430fr5994",2,8 },
++  { "msp430fr59941",2,8 },
+   { "msp430fr5xx_6xxgeneric",2,8 },
+   { "msp430fr6820",2,8 },
+   { "msp430fr6822",2,8 },
+