#! /bin/sh /usr/share/dpatch/dpatch-run
## 501-binutils-msp-new-cpus2.dpatch by  <smckown@stevex2>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Add new cpu variations to the msp430 architecture

@DPATCH@

diff -ur binutils-2.18.orig/bfd/archures.c binutils-2.18/bfd/archures.c
--- binutils-2.18.orig/bfd/archures.c	2008-05-25 16:57:13.406250000 +0300
+++ binutils-2.18/bfd/archures.c	2008-05-25 17:07:00.437500000 +0300
@@ -377,6 +377,9 @@
 .#define bfd_mach_msp20          20
 .#define bfd_mach_msp21          21
 .#define bfd_mach_msp22          22
+.#define bfd_mach_msp24          24
+.#define bfd_mach_msp241         241
+.#define bfd_mach_msp26          26
 .#define bfd_mach_msp31          31
 .#define bfd_mach_msp32          32
 .#define bfd_mach_msp33          33
diff -ur binutils-2.18.orig/bfd/bfd-in2.h binutils-2.18/bfd/bfd-in2.h
--- binutils-2.18.orig/bfd/bfd-in2.h	2008-05-25 16:57:13.437500000 +0300
+++ binutils-2.18/bfd/bfd-in2.h	2008-05-25 17:07:00.468750000 +0300
@@ -2048,6 +2048,9 @@
 #define bfd_mach_msp20          20
 #define bfd_mach_msp21          21
 #define bfd_mach_msp22          22
+#define bfd_mach_msp24          24
+#define bfd_mach_msp241         241
+#define bfd_mach_msp26          26
 #define bfd_mach_msp31          31
 #define bfd_mach_msp32          32
 #define bfd_mach_msp33          33
diff -ur binutils-2.18.orig/bfd/cpu-msp430.c binutils-2.18/bfd/cpu-msp430.c
--- binutils-2.18.orig/bfd/cpu-msp430.c	2008-05-25 16:57:13.437500000 +0300
+++ binutils-2.18/bfd/cpu-msp430.c	2008-05-25 17:07:00.484375000 +0300
@@ -74,26 +74,35 @@
   /* msp430x22x.  */
   N (16, bfd_mach_msp22, "msp:22", FALSE, & arch_info_struct[10]),
 
+  /* msp430x24x including msp430x2410 */
+  N (16, bfd_mach_msp24, "msp:24", FALSE, & arch_info_struct[11]),
+
+  /* msp430x241x except msp430x2410 (extended address range) */
+  N (16, bfd_mach_msp241, "msp:241", FALSE, & arch_info_struct[12]),
+
+  /* msp430x26x.  */
+  N (16, bfd_mach_msp26, "msp:26", FALSE, & arch_info_struct[13]),
+
   /* msp430x31x.  */
-  N (16, bfd_mach_msp31, "msp:31", FALSE, & arch_info_struct[11]), 
+  N (16, bfd_mach_msp31, "msp:31", FALSE, & arch_info_struct[14]), 
 
   /* msp430x32x.  */
-  N (16, bfd_mach_msp32, "msp:32", FALSE, & arch_info_struct[12]), 
+  N (16, bfd_mach_msp32, "msp:32", FALSE, & arch_info_struct[15]), 
 
   /* msp430x33x.  */
-  N (16, bfd_mach_msp33, "msp:33", FALSE, & arch_info_struct[13]),
+  N (16, bfd_mach_msp33, "msp:33", FALSE, & arch_info_struct[16]),
   
   /* msp430x41x.  */
-  N (16, bfd_mach_msp41, "msp:41", FALSE, & arch_info_struct[14]),
+  N (16, bfd_mach_msp41, "msp:41", FALSE, & arch_info_struct[17]),
 
   /* msp430x42x.  */
-  N (16, bfd_mach_msp42, "msp:42", FALSE, & arch_info_struct[15]),
+  N (16, bfd_mach_msp42, "msp:42", FALSE, & arch_info_struct[18]),
 
   /* msp430x43x.  */
-  N (16, bfd_mach_msp43, "msp:43", FALSE, & arch_info_struct[16]),
+  N (16, bfd_mach_msp43, "msp:43", FALSE, & arch_info_struct[19]),
 
   /* msp430x44x.  */
-  N (16, bfd_mach_msp44, "msp:44", FALSE, & arch_info_struct[17]),
+  N (16, bfd_mach_msp44, "msp:44", FALSE, & arch_info_struct[20]),
 
   /* msp430x46xx.  */
   N (16, bfd_mach_msp46, "msp:46", FALSE, NULL)
diff -ur binutils-2.18.orig/bfd/doc/archures.texi binutils-2.18/bfd/doc/archures.texi
--- binutils-2.18.orig/bfd/doc/archures.texi	2008-05-25 16:57:13.453125000 +0300
+++ binutils-2.18/bfd/doc/archures.texi	2008-05-25 17:07:00.500000000 +0300
@@ -342,6 +342,9 @@
 #define bfd_mach_msp20          20
 #define bfd_mach_msp21          21
 #define bfd_mach_msp22          22
+#define bfd_mach_msp24          24
+#define bfd_mach_msp241         241
+#define bfd_mach_msp26          26
 #define bfd_mach_msp31          31
 #define bfd_mach_msp32          32
 #define bfd_mach_msp33          33
@@ -599,4 +602,3 @@
 
 This routine is provided for those cases where a bfd * is not
 available
-
diff -ur binutils-2.18.orig/bfd/elf32-msp430.c binutils-2.18/bfd/elf32-msp430.c
--- binutils-2.18.orig/bfd/elf32-msp430.c	2008-05-25 16:57:13.468750000 +0300
+++ binutils-2.18/bfd/elf32-msp430.c	2008-05-25 17:07:00.515625000 +0300
@@ -576,6 +576,18 @@
       val = E_MSP430_MACH_MSP430x22;
       break;
 
+    case bfd_mach_msp24:
+      val = E_MSP430_MACH_MSP430x24;
+      break;
+
+    case bfd_mach_msp241:
+      val = E_MSP430_MACH_MSP430x241;
+      break;
+
+    case bfd_mach_msp26:
+      val = E_MSP430_MACH_MSP430x26;
+      break;
+
     case bfd_mach_msp31:
       val = E_MSP430_MACH_MSP430x31;
       break;
@@ -669,6 +681,18 @@
 	  e_set = bfd_mach_msp22;
 	  break;
 
+	case E_MSP430_MACH_MSP430x24:
+	  e_set = bfd_mach_msp24;
+	  break;
+
+	case E_MSP430_MACH_MSP430x241:
+	  e_set = bfd_mach_msp241;
+	  break;
+
+	case E_MSP430_MACH_MSP430x26:
+	  e_set = bfd_mach_msp26;
+	  break;
+
 	case E_MSP430_MACH_MSP430x31:
 	  e_set = bfd_mach_msp31;
 	  break;
diff -ur binutils-2.18.orig/gas/config/tc-msp430.c binutils-2.18/gas/config/tc-msp430.c
--- binutils-2.18.orig/gas/config/tc-msp430.c	2008-05-25 16:57:13.484375000 +0300
+++ binutils-2.18/gas/config/tc-msp430.c	2008-05-25 17:07:00.531250000 +0300
@@ -250,6 +250,9 @@
 #define MSP430_ISA_20   20
 #define MSP430_ISA_21   21
 #define MSP430_ISA_22   22
+#define MSP430_ISA_24   24
+#define MSP430_ISA_241  241
+#define MSP430_ISA_26   26
 #define MSP430_ISA_31   31
 #define MSP430_ISA_32   32
 #define MSP430_ISA_33   33
@@ -317,6 +320,24 @@
   {"msp430x2234",  MSP430_ISA_22,  bfd_mach_msp22},
   {"msp430x2254",  MSP430_ISA_22,  bfd_mach_msp22},
   {"msp430x2274",  MSP430_ISA_22,  bfd_mach_msp22},
+
+  {"msp430x247",   MSP430_ISA_24,  bfd_mach_msp24},
+  {"msp430x2471",  MSP430_ISA_24,  bfd_mach_msp24},
+  {"msp430x248",   MSP430_ISA_24,  bfd_mach_msp24},
+  {"msp430x2481",  MSP430_ISA_24,  bfd_mach_msp24},
+  {"msp430x249",   MSP430_ISA_24,  bfd_mach_msp24},
+  {"msp430x2491",  MSP430_ISA_24,  bfd_mach_msp24},
+  {"msp430x2410",  MSP430_ISA_24,  bfd_mach_msp24},
+
+  {"msp430x2416",  MSP430_ISA_241, bfd_mach_msp241},
+  {"msp430x2417",  MSP430_ISA_241, bfd_mach_msp241},
+  {"msp430x2418",  MSP430_ISA_241, bfd_mach_msp241},
+  {"msp430x2419",  MSP430_ISA_241, bfd_mach_msp241},
+  
+  {"msp430x2616",  MSP430_ISA_26,  bfd_mach_msp26},
+  {"msp430x2617",  MSP430_ISA_26,  bfd_mach_msp26},
+  {"msp430x2618",  MSP430_ISA_26,  bfd_mach_msp26},
+  {"msp430x2619",  MSP430_ISA_26,  bfd_mach_msp26},
   
   {"msp430x311",   MSP430_ISA_31,  bfd_mach_msp31},
   {"msp430x312",   MSP430_ISA_31,  bfd_mach_msp31},
@@ -844,6 +865,10 @@
 	     "                  msp430x2003  msp430x2013\n"
 	     "                  msp430x2101  msp430x2111  msp430x2121  msp430x2131\n"
 	     "                  msp430x2234  msp430x2254  msp430x2274\n"
+	     "                  msp430x247   msp430x248   msp430x249   msp430x2410\n"
+	     "                  msp430x2471  msp430x2481  msp430x2491\n"
+	     "                  msp430x2416  msp430x2417  msp430x2418  msp430x2419\n"
+	     "                  msp430x2616  msp430x2617  msp430x2618  msp430x2619\n"
 	     "                  msp430x311   msp430x312   msp430x313   msp430x314  msp430x315\n"
 	     "                  msp430x323   msp430x325\n" 
 	     "                  msp430x336   msp430x337\n"
diff -ur binutils-2.18.orig/include/elf/msp430.h binutils-2.18/include/elf/msp430.h
--- binutils-2.18.orig/include/elf/msp430.h	2008-05-25 16:57:13.484375000 +0300
+++ binutils-2.18/include/elf/msp430.h	2008-05-25 17:07:00.531250000 +0300
@@ -36,6 +36,9 @@
 #define E_MSP430_MACH_MSP430x20   20
 #define E_MSP430_MACH_MSP430x21   21
 #define E_MSP430_MACH_MSP430x22   22
+#define E_MSP430_MACH_MSP430x24   24
+#define E_MSP430_MACH_MSP430x241  241
+#define E_MSP430_MACH_MSP430x26   26
 #define E_MSP430_MACH_MSP430x31   31
 #define E_MSP430_MACH_MSP430x32   32
 #define E_MSP430_MACH_MSP430x33   33
diff -ur binutils-2.18.orig/ld/Makefile.am binutils-2.18/ld/Makefile.am
--- binutils-2.18.orig/ld/Makefile.am	2008-05-25 16:57:13.531250000 +0300
+++ binutils-2.18/ld/Makefile.am	2008-05-25 17:07:00.578125000 +0300
@@ -321,6 +321,21 @@
 	emsp430x2234.o \
 	emsp430x2254.o \
 	emsp430x2274.o \
+	emsp430x247.o \
+	emsp430x248.o \
+	emsp430x249.o \
+	emsp430x2410.o \
+	emsp430x2471.o \
+	emsp430x2481.o \
+	emsp430x2491.o \
+	emsp430x2416.o \
+	emsp430x2417.o \
+	emsp430x2418.o \
+	emsp430x2419.o \
+	emsp430x2616.o \
+	emsp430x2617.o \
+	emsp430x2618.o \
+	emsp430x2619.o \
 	emsp430x311.o \
 	emsp430x312.o \
 	emsp430x313.o \
@@ -1433,6 +1448,66 @@
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
   ${GEN_DEPENDS}
 	${GENSCRIPTS} msp430x2274 "$(tdir_msp430x2274)" msp430all
+emsp430x247.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x247 "$(tdir_msp430x247)" msp430all
+emsp430x248.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x248 "$(tdir_msp430x248)" msp430all
+emsp430x249.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x249 "$(tdir_msp430x249)" msp430all
+emsp430x2410.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x2410 "$(tdir_msp430x2410)" msp430all
+emsp430x2471.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x2471 "$(tdir_msp430x2471)" msp430all
+emsp430x2481.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x2481 "$(tdir_msp430x2481)" msp430all
+emsp430x2491.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x2491 "$(tdir_msp430x2491)" msp430all
+emsp430x2416.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x2416 "$(tdir_msp430x2416)" msp430all
+emsp430x2417.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x2417 "$(tdir_msp430x2417)" msp430all
+emsp430x2418.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x2418 "$(tdir_msp430x2418)" msp430all
+emsp430x2419.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x2419 "$(tdir_msp430x2419)" msp430all
+emsp430x2616.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x2616 "$(tdir_msp430x2616)" msp430all
+emsp430x2617.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x2617 "$(tdir_msp430x2617)" msp430all
+emsp430x2618.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x2618 "$(tdir_msp430x2618)" msp430all
+emsp430x2619.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x2619 "$(tdir_msp430x2619)" msp430all
 emsp430x311.c: $(srcdir)/emulparams/msp430all.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430_3.sc \
   ${GEN_DEPENDS}
diff -ur binutils-2.18.orig/ld/Makefile.in binutils-2.18/ld/Makefile.in
--- binutils-2.18.orig/ld/Makefile.in	2008-05-25 16:57:13.546875000 +0300
+++ binutils-2.18/ld/Makefile.in	2008-05-25 17:07:00.593750000 +0300
@@ -568,6 +568,21 @@
 	emsp430x2234.o \
 	emsp430x2254.o \
 	emsp430x2274.o \
+	emsp430x247.o \
+	emsp430x248.o \
+	emsp430x249.o \
+	emsp430x2410.o \
+	emsp430x2471.o \
+	emsp430x2481.o \
+	emsp430x2491.o \
+	emsp430x2416.o \
+	emsp430x2417.o \
+	emsp430x2418.o \
+	emsp430x2419.o \
+	emsp430x2616.o \
+	emsp430x2617.o \
+	emsp430x2618.o \
+	emsp430x2619.o \
 	emsp430x311.o \
 	emsp430x312.o \
 	emsp430x313.o \
@@ -2259,6 +2274,66 @@
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
   ${GEN_DEPENDS}
 	${GENSCRIPTS} msp430x2274 "$(tdir_msp430x2274)" msp430all
+emsp430x247.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x247 "$(tdir_msp430x247)" msp430all
+emsp430x248.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x248 "$(tdir_msp430x248)" msp430all
+emsp430x249.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x249 "$(tdir_msp430x249)" msp430all
+emsp430x2410.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x2410 "$(tdir_msp430x2410)" msp430all
+emsp430x2471.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x2471 "$(tdir_msp430x2471)" msp430all
+emsp430x2481.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x2481 "$(tdir_msp430x2481)" msp430all
+emsp430x2491.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x2491 "$(tdir_msp430x2491)" msp430all
+emsp430x2416.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x2416 "$(tdir_msp430x2416)" msp430all
+emsp430x2417.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x2417 "$(tdir_msp430x2417)" msp430all
+emsp430x2418.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x2418 "$(tdir_msp430x2418)" msp430all
+emsp430x2419.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x2419 "$(tdir_msp430x2419)" msp430all
+emsp430x2616.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x2616 "$(tdir_msp430x2616)" msp430all
+emsp430x2617.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x2617 "$(tdir_msp430x2617)" msp430all
+emsp430x2618.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x2618 "$(tdir_msp430x2618)" msp430all
+emsp430x2619.c: $(srcdir)/emulparams/msp430all.sh \
+  $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
+  ${GEN_DEPENDS}
+	${GENSCRIPTS} msp430x2619 "$(tdir_msp430x2619)" msp430all
 emsp430x311.c: $(srcdir)/emulparams/msp430all.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430_3.sc \
   ${GEN_DEPENDS}
diff -ur binutils-2.18.orig/ld/configure.tgt binutils-2.18/ld/configure.tgt
--- binutils-2.18.orig/ld/configure.tgt	2008-05-25 16:57:13.500000000 +0300
+++ binutils-2.18/ld/configure.tgt	2008-05-25 17:07:00.562500000 +0300
@@ -407,7 +407,7 @@
 mt-*elf)                targ_emul=elf32mt
 			;;
 msp430-*-*)             targ_emul=msp430x110
-                        targ_extra_emuls="msp430x112 msp430x1101 msp430x1111 msp430x1121 msp430x1122 msp430x1132 msp430x122 msp430x123 msp430x1222 msp430x1232 msp430x133 msp430x135 msp430x1331 msp430x1351 msp430x147 msp430x148 msp430x149 msp430x1471 msp430x1481 msp430x1491 msp430x155 msp430x156 msp430x157 msp430x167 msp430x168 msp430x169 msp430x1610 msp430x1611 msp430x1612 msp430x2001 msp430x2011 msp430x2002 msp430x2012 msp430x2003 msp430x2013 msp430x2101 msp430x2111 msp430x2121 msp430x2131 msp430x2234 msp430x2254 msp430x2274 msp430x311 msp430x312 msp430x313 msp430x314 msp430x315 msp430x323 msp430x325 msp430x336 msp430x337 msp430x412 msp430x413 msp430x415 msp430x417 msp430x423 msp430x425 msp430x427 msp430x4250 msp430x4260 msp430x4270 msp430xE423 msp430xE425 msp430xE427 msp430xW423 msp430xW425 msp430xW427 msp430xG437 msp430xG438 msp430xG439 msp430x435 msp430x436 msp430x437 msp430x447 msp430x448 msp430x449 msp430xG4616 msp430xG4617 msp430xG4618 msp430xG4619"
+                        targ_extra_emuls="msp430x112 msp430x1101 msp430x1111 msp430x1121 msp430x1122 msp430x1132 msp430x122 msp430x123 msp430x1222 msp430x1232 msp430x133 msp430x135 msp430x1331 msp430x1351 msp430x147 msp430x148 msp430x149 msp430x1471 msp430x1481 msp430x1491 msp430x155 msp430x156 msp430x157 msp430x167 msp430x168 msp430x169 msp430x1610 msp430x1611 msp430x1612 msp430x2001 msp430x2011 msp430x2002 msp430x2012 msp430x2003 msp430x2013 msp430x2101 msp430x2111 msp430x2121 msp430x2131 msp430x2234 msp430x2254 msp430x2274 msp430x247 msp430x248 msp430x249 msp430x2410 msp430x2471 msp430x2481 msp430x2491 msp430x2416 msp430x2417 msp430x2418 msp430x2419 msp430x2616 msp430x2617 msp430x2618 msp430x2619 msp430x311 msp430x312 msp430x313 msp430x314 msp430x315 msp430x323 msp430x325 msp430x336 msp430x337 msp430x412 msp430x413 msp430x415 msp430x417 msp430x423 msp430x425 msp430x427 msp430x4250 msp430x4260 msp430x4270 msp430xE423 msp430xE425 msp430xE427 msp430xW423 msp430xW425 msp430xW427 msp430xG437 msp430xG438 msp430xG439 msp430x435 msp430x436 msp430x437 msp430x447 msp430x448 msp430x449 msp430xG4616 msp430xG4617 msp430xG4618 msp430xG4619"
 			;;
 ns32k-pc532-mach* | ns32k-pc532-ux*)  targ_emul=pc532macha ;;
 ns32k-*-netbsd* | ns32k-pc532-lites*) targ_emul=ns32knbsd
diff -ur binutils-2.18.orig/ld/emulparams/msp430all.sh binutils-2.18/ld/emulparams/msp430all.sh
--- binutils-2.18.orig/ld/emulparams/msp430all.sh	2008-05-25 16:57:13.515625000 +0300
+++ binutils-2.18/ld/emulparams/msp430all.sh	2008-05-25 17:07:00.562500000 +0300
@@ -485,6 +485,171 @@
 STACK=0x600
 fi
 
+if [ "${MSP430_NAME}" = "msp430x247" ] ; then
+ARCH=msp:24
+ROM_START=0x8000
+ROM_SIZE=0x7fe0
+RAM_START=0x1100
+RAM_SIZE=4096
+VECTORS_START=0xffe0
+VECTORS_SIZE=32
+STACK=0x2100
+fi
+
+if [ "${MSP430_NAME}" = "msp430x248" ] ; then
+ARCH=msp:24
+ROM_START=0x4000
+ROM_SIZE=0xbfe0
+RAM_START=0x1100
+RAM_SIZE=4096
+VECTORS_START=0xffe0
+VECTORS_SIZE=32
+STACK=0x2100
+fi
+
+if [ "${MSP430_NAME}" = "msp430x249" ] ; then
+ARCH=msp:24
+ROM_START=0x1100
+ROM_SIZE=0xeee0
+RAM_START=0x0200
+RAM_SIZE=2048
+VECTORS_START=0xffe0
+VECTORS_SIZE=32
+STACK=0xa00
+fi
+
+if [ "${MSP430_NAME}" = "msp430x2410" ] ; then
+ARCH=msp:24
+ROM_START=0x2100
+ROM_SIZE=0xdee0
+RAM_START=0x1100
+RAM_SIZE=4096
+VECTORS_START=0xffe0
+VECTORS_SIZE=32
+STACK=0x2100
+fi
+
+if [ "${MSP430_NAME}" = "msp430x2471" ] ; then
+ARCH=msp:24
+ROM_START=0x8000
+ROM_SIZE=0x7fe0
+RAM_START=0x1100
+RAM_SIZE=4096
+VECTORS_START=0xffe0
+VECTORS_SIZE=32
+STACK=0x2100
+fi
+
+if [ "${MSP430_NAME}" = "msp430x2481" ] ; then
+ARCH=msp:24
+ROM_START=0x4000
+ROM_SIZE=0xbfe0
+RAM_START=0x1100
+RAM_SIZE=4096
+VECTORS_START=0xffe0
+VECTORS_SIZE=32
+STACK=0x2100
+fi
+
+if [ "${MSP430_NAME}" = "msp430x2491" ] ; then
+ARCH=msp:24
+ROM_START=0x1100
+ROM_SIZE=0xeee0
+RAM_START=0x0200
+RAM_SIZE=2048
+VECTORS_START=0xffe0
+VECTORS_SIZE=32
+STACK=0xa00
+fi
+
+if [ "${MSP430_NAME}" = "msp430x2416" ] ; then
+ARCH=msp:241
+ROM_START=0x2100
+ROM_SIZE=0xdec0
+RAM_START=0x1100
+RAM_SIZE=4096
+VECTORS_START=0xffc0
+VECTORS_SIZE=64
+STACK=0x2100
+fi
+
+if [ "${MSP430_NAME}" = "msp430x2417" ] ; then
+ARCH=msp:241
+ROM_START=0x3100
+ROM_SIZE=0xcec0
+RAM_START=0x1100
+RAM_SIZE=8192
+VECTORS_START=0xffc0
+VECTORS_SIZE=64
+STACK=0x3100
+fi
+
+if [ "${MSP430_NAME}" = "msp430x2418" ] ; then
+ARCH=msp:241
+ROM_START=0x3100
+ROM_SIZE=0xcec0
+RAM_START=0x1100
+RAM_SIZE=8192
+VECTORS_START=0xffc0
+VECTORS_SIZE=64
+STACK=0x3100
+fi
+
+if [ "${MSP430_NAME}" = "msp430x2419" ] ; then
+ARCH=msp:241
+ROM_START=0x2100
+ROM_SIZE=0xdec0
+RAM_START=0x1100
+RAM_SIZE=4096
+VECTORS_START=0xffc0
+VECTORS_SIZE=64
+STACK=0x2100
+fi
+
+if [ "${MSP430_NAME}" = "msp430x2616" ] ; then
+ARCH=msp:26
+ROM_START=0x2100
+ROM_SIZE=0xdec0
+RAM_START=0x1100
+RAM_SIZE=4096
+VECTORS_START=0xffc0
+VECTORS_SIZE=64
+STACK=0x2100
+fi
+
+if [ "${MSP430_NAME}" = "msp430x2617" ] ; then
+ARCH=msp:26
+ROM_START=0x3100
+ROM_SIZE=0xcec0
+RAM_START=0x1100
+RAM_SIZE=8192
+VECTORS_START=0xffc0
+VECTORS_SIZE=64
+STACK=0x3100
+fi
+
+if [ "${MSP430_NAME}" = "msp430x2618" ] ; then
+ARCH=msp:26
+ROM_START=0x3100
+ROM_SIZE=0xcec0
+RAM_START=0x1100
+RAM_SIZE=8192
+VECTORS_START=0xffc0
+VECTORS_SIZE=64
+STACK=0x3100
+fi
+
+if [ "${MSP430_NAME}" = "msp430x2619" ] ; then
+ARCH=msp:26
+ROM_START=0x2100
+ROM_SIZE=0xdec0
+RAM_START=0x1100
+RAM_SIZE=4096
+VECTORS_START=0xffc0
+VECTORS_SIZE=64
+STACK=0x2100
+fi
+
 if [ "${MSP430_NAME}" = "msp430x311" ] ; then
 ARCH=msp:31
 SCRIPT_NAME=elf32msp430_3
diff -ur binutils-2.18.orig/opcodes/msp430-dis.c binutils-2.18/opcodes/msp430-dis.c
--- binutils-2.18.orig/opcodes/msp430-dis.c	2008-05-25 16:57:13.578125000 +0300
+++ binutils-2.18/opcodes/msp430-dis.c	2008-05-25 17:07:00.609375000 +0300
@@ -681,7 +681,9 @@
 
   if (((int) addr & 0xffff) >= 0xffe0
       ||
-      (info->mach == 46  &&  ((int) addr & 0xffff) >= 0xffc0))
+      ((info->mach == 241 || info->mach == 26 || info->mach == 46)
+       &&
+       ((int) addr & 0xffff) >= 0xffc0))
     {
       (*prin) (stream, "interrupt service routine at 0x%04x", 0xffff & insn);
       return 2;