summaryrefslogtreecommitdiff
path: root/devel/msp430-binutils/files/patch-gas::config::tc-msp430.c
diff options
context:
space:
mode:
authorLev A. Serebryakov <lev@FreeBSD.org>2004-08-03 10:52:44 +0000
committerLev A. Serebryakov <lev@FreeBSD.org>2004-08-03 10:52:44 +0000
commit519118db47b2fbc6508f9bfc89930b630c856098 (patch)
treea502152330f90c96727bc4a5e2b07b4a45ce11fa /devel/msp430-binutils/files/patch-gas::config::tc-msp430.c
parentUpdate to 2.5.11 (diff)
Update yto latest version 2.15
Diffstat (limited to 'devel/msp430-binutils/files/patch-gas::config::tc-msp430.c')
-rw-r--r--devel/msp430-binutils/files/patch-gas::config::tc-msp430.c156
1 files changed, 13 insertions, 143 deletions
diff --git a/devel/msp430-binutils/files/patch-gas::config::tc-msp430.c b/devel/msp430-binutils/files/patch-gas::config::tc-msp430.c
index c40ef93dce02..a0fe86af0654 100644
--- a/devel/msp430-binutils/files/patch-gas::config::tc-msp430.c
+++ b/devel/msp430-binutils/files/patch-gas::config::tc-msp430.c
@@ -1,151 +1,21 @@
---- gas/config/tc-msp430.c.orig Tue Mar 4 19:34:40 2003
-+++ gas/config/tc-msp430.c Mon Mar 1 16:09:21 2004
-@@ -71,18 +71,19 @@
- };
-
- #define MSP430_ISA_11 11
-+#define MSP430_ISA_110 110
- #define MSP430_ISA_12 12
- #define MSP430_ISA_13 13
- #define MSP430_ISA_14 14
--#define MSP430_ISA_41 41
-+#define MSP430_ISA_15 15
-+#define MSP430_ISA_16 16
- #define MSP430_ISA_31 31
- #define MSP430_ISA_32 32
- #define MSP430_ISA_33 33
--#define MSP430_ISA_110 110
-+#define MSP430_ISA_41 41
-+#define MSP430_ISA_42 42
- #define MSP430_ISA_43 43
- #define MSP430_ISA_44 44
--#define MSP430_ISA_15 15
--#define MSP430_ISA_16 16
-
- #define CHECK_RELOC_MSP430 ((imm_op || byte_op)?BFD_RELOC_MSP430_16_BYTE:BFD_RELOC_MSP430_16)
- #define CHECK_RELOC_MSP430_PCREL ((imm_op || byte_op)?BFD_RELOC_MSP430_16_PCREL_BYTE:BFD_RELOC_MSP430_16_PCREL)
-@@ -93,20 +94,35 @@
- {"msp2", MSP430_ISA_14, bfd_mach_msp14},
- {"msp430x110", MSP430_ISA_11, bfd_mach_msp11},
- {"msp430x112", MSP430_ISA_11, bfd_mach_msp11},
-- {"msp430x122", MSP430_ISA_12, bfd_mach_msp12},
-- {"msp430x122", MSP430_ISA_12, bfd_mach_msp12},
-- {"msp430x1222",MSP430_ISA_12, bfd_mach_msp12},
-+ {"msp430x1101",MSP430_ISA_110, bfd_mach_msp110},
-+ {"msp430x1111",MSP430_ISA_110, bfd_mach_msp110},
-+ {"msp430x1121",MSP430_ISA_110, bfd_mach_msp110},
- {"msp430x1122",MSP430_ISA_11, bfd_mach_msp110},
- {"msp430x1132",MSP430_ISA_11, bfd_mach_msp110},
-+
-+ {"msp430x122", MSP430_ISA_12, bfd_mach_msp12},
- {"msp430x123", MSP430_ISA_12, bfd_mach_msp12},
-+ {"msp430x1222",MSP430_ISA_12, bfd_mach_msp12},
- {"msp430x1232",MSP430_ISA_12, bfd_mach_msp12},
-+
- {"msp430x133", MSP430_ISA_13, bfd_mach_msp13},
- {"msp430x135", MSP430_ISA_13, bfd_mach_msp13},
-+ {"msp430x1331",MSP430_ISA_13, bfd_mach_msp13},
-+ {"msp430x1351",MSP430_ISA_13, bfd_mach_msp13},
- {"msp430x147", MSP430_ISA_14, bfd_mach_msp14},
- {"msp430x148", MSP430_ISA_14, bfd_mach_msp14},
- {"msp430x149", MSP430_ISA_14, bfd_mach_msp14},
-- {"msp430x412", MSP430_ISA_41, bfd_mach_msp41},
-- {"msp430x413", MSP430_ISA_41, bfd_mach_msp41},
-+
-+ {"msp430x155", MSP430_ISA_15, bfd_mach_msp15},
-+ {"msp430x156", MSP430_ISA_15, bfd_mach_msp15},
-+ {"msp430x157", MSP430_ISA_15, bfd_mach_msp15},
-+ {"msp430x167", MSP430_ISA_16, bfd_mach_msp16},
-+ {"msp430x168", MSP430_ISA_16, bfd_mach_msp16},
-+ {"msp430x169", MSP430_ISA_16, bfd_mach_msp16},
+--- gas/config/tc-msp430.c.orig Tue Aug 3 12:55:44 2004
++++ gas/config/tc-msp430.c Tue Aug 3 12:55:52 2004
+@@ -119,6 +119,9 @@
+ {"msp430x167", MSP430_ISA_16, bfd_mach_msp16},
+ {"msp430x168", MSP430_ISA_16, bfd_mach_msp16},
+ {"msp430x169", MSP430_ISA_16, bfd_mach_msp16},
+ {"msp430x1610", MSP430_ISA_16, bfd_mach_msp16},
+ {"msp430x1611", MSP430_ISA_16, bfd_mach_msp16},
+ {"msp430x1612", MSP430_ISA_16, bfd_mach_msp16},
-+
+
{"msp430x311", MSP430_ISA_31, bfd_mach_msp31},
{"msp430x312", MSP430_ISA_31, bfd_mach_msp31},
- {"msp430x313", MSP430_ISA_31, bfd_mach_msp31},
-@@ -116,23 +132,25 @@
- {"msp430x325", MSP430_ISA_32, bfd_mach_msp32},
- {"msp430x336", MSP430_ISA_33, bfd_mach_msp33},
- {"msp430x337", MSP430_ISA_33, bfd_mach_msp33},
-- {"msp430x1101",MSP430_ISA_110, bfd_mach_msp110},
-- {"msp430x1111",MSP430_ISA_110, bfd_mach_msp110},
-- {"msp430x1121",MSP430_ISA_110, bfd_mach_msp110},
-- {"msp430x1331",MSP430_ISA_13, bfd_mach_msp13},
-- {"msp430x1351",MSP430_ISA_13, bfd_mach_msp13},
-+
-+ {"msp430x412", MSP430_ISA_41, bfd_mach_msp41},
-+ {"msp430x413", MSP430_ISA_41, bfd_mach_msp41},
+@@ -132,6 +135,8 @@
+
+ {"msp430x412", MSP430_ISA_41, bfd_mach_msp41},
+ {"msp430x413", MSP430_ISA_41, bfd_mach_msp41},
+ {"msp430x415", MSP430_ISA_41, bfd_mach_msp41},
+ {"msp430x417", MSP430_ISA_41, bfd_mach_msp41},
-+
-+ {"msp430xE423", MSP430_ISA_42, bfd_mach_msp42},
-+ {"msp430xE425", MSP430_ISA_42, bfd_mach_msp42},
-+ {"msp430xE427", MSP430_ISA_42, bfd_mach_msp42},
-+ {"msp430xW423", MSP430_ISA_42, bfd_mach_msp42},
-+ {"msp430xW425", MSP430_ISA_42, bfd_mach_msp42},
-+ {"msp430xW427", MSP430_ISA_42, bfd_mach_msp42},
-+
- {"msp430x435", MSP430_ISA_43, bfd_mach_msp43},
- {"msp430x436", MSP430_ISA_43, bfd_mach_msp43},
- {"msp430x437", MSP430_ISA_43, bfd_mach_msp43},
- {"msp430x447", MSP430_ISA_44, bfd_mach_msp44},
- {"msp430x448", MSP430_ISA_44, bfd_mach_msp44},
- {"msp430x449", MSP430_ISA_44, bfd_mach_msp44},
-- {"msp430x167", MSP430_ISA_16, bfd_mach_msp16},
-- {"msp430x168", MSP430_ISA_16, bfd_mach_msp16},
-- {"msp430x169", MSP430_ISA_16, bfd_mach_msp16},
-- {"msp430x155", MSP430_ISA_15, bfd_mach_msp15},
-- {"msp430x156", MSP430_ISA_15, bfd_mach_msp15},
-- {"msp430x157", MSP430_ISA_15, bfd_mach_msp15},
-
- {NULL, 0, 0}
- };
-@@ -186,14 +204,19 @@
- " msp430x1101 msp430x1111\n"
- " msp430x1121 msp430x1122 msp430x1132\n"
- " msp430x122 msp430x123\n"
-+ " msp430x1222 msp430x1232\n"
-+ " msp430x133 msp430x135\n"
- " msp430x1331 msp430x1351\n"
- " msp430x147 msp430x148 msp430x149\n"
- " msp430x155 msp430x156 msp430x157\n"
- " msp430x167 msp430x168 msp430x169\n"
-+ " msp430x1610 msp430x1611 msp430x1612\n"
- " msp430x311 msp430x312 msp430x313 msp430x314 msp430x315\n"
- " msp430x323 msp430x325\n"
- " msp430x336 msp430x337\n"
-- " msp430x412 msp430x413\n"
-+ " msp430x412 msp430x413 msp430x415 msp430x417\n"
-+ " msp430xE423 msp430xE425 msp430E427\n"
-+ " msp430xW423 msp430xW425 msp430W427\n"
- " msp430x435 msp430x436 msp430x437\n"
- " msp430x447 msp430x448 msp430x449\n"));
-@@ -979,11 +1002,7 @@
- else if (x == 4)
- {
- #ifdef PUSH_1X_WORKAROUND
-- if (bin == 0x1200
-- && (msp430_mcu->isa == MSP430_ISA_11
-- || msp430_mcu->isa == MSP430_ISA_12
-- || msp430_mcu->isa == MSP430_ISA_13
-- || msp430_mcu->isa == MSP430_ISA_14))
-+ if (bin == 0x1200)
- {
- /* Remove warning as confusing.
- as_warn(_("Hardware push bug workaround")); */
-@@ -1000,11 +1019,7 @@
- else if (x == 8)
- {
- #ifdef PUSH_1X_WORKAROUND
-- if (bin == 0x1200
-- && (msp430_mcu->isa == MSP430_ISA_11
-- || msp430_mcu->isa == MSP430_ISA_12
-- || msp430_mcu->isa == MSP430_ISA_13
-- || msp430_mcu->isa == MSP430_ISA_14))
-+ if (bin == 0x1200)
- {
- /* Remove warning as confusing.
- as_warn(_("Hardware push bug workaround")); */
+ {"msp430xE423", MSP430_ISA_42, bfd_mach_msp42},
+ {"msp430xE425", MSP430_ISA_42, bfd_mach_msp42},