Hi Dmitry,
The attached patches should complete support for the 1122 and 1132.
Should binutils patches go to you now, or straight to someone working on
binutils? If so, to whom?
Regards,
Steve
diff -rU5 gcc-3.2.2.orig/config/gcc/msp430/msp430.c
gcc-3.2.2/gccconfig//msp430/msp430.c
--- gcc-3.2.2.orig/gcc/config/msp430/msp430.c 2003-03-03 23:46:44.000000000
+0800
+++ gcc-3.2.2/gcc/config/msp430/msp430.c 2003-03-04 12:29:40.000000000
+0800
@@ -125,13 +125,10 @@
const char *name;
enum msp430_arch arch;
int has_hwmul;
};
-/* recently added:
-1331, 1351, 435, 436, 437, 447, 448, 449 */
-
static struct mcu_type_s msp430_mcu_types[] = {
{"msp1", MSP430_ISA_1, 0},
{"msp2", MSP430_ISA_2, 1},
{"msp430x1101", MSP430_ISA_110, 0},
{"msp430x1111", MSP430_ISA_110, 0},
diff -rU5 gcc-3.2.2.orig/gcc/config/msp430/msp430.h
gcc-3.2.2/gcc/config/msp430/msp430.h
--- gcc-3.2.2.orig/gcc/config/msp430/msp430.h 2003-03-03 23:46:44.000000000
+0800
+++ gcc-3.2.2/gcc/config/msp430/msp430.h 2003-03-04 12:27:56.000000000
+0800
@@ -2780,13 +2780,10 @@
#define TARGET_MEM_FUNCTIONS
/* Define this macro if GNU CC should generate calls to the System V
(and ANSI C) library functions `memcpy' and `memset' rather than
the BSD functions `bcopy' and `bzero'. */
-/* recently added:
-1331, 1351, 412, 413, 435, 436, 437, 447, 448, 449 */
-
#define CPP_SPEC "\
%{!mmcu*|mmcu=msp1:%(cpp_msp1)} \
%{mmcu=msp2:%(cpp_msp2)} \
%{mmcu=msp430x1101:%(cpp_msp1) -D__MSP430_1101__} \
%{mmcu=msp430x1111:%(cpp_msp1) -D__MSP430_1111__} \
@@ -2805,10 +2802,12 @@
%{mmcu=msp430x112:%(cpp_msp1) -D__MSP430_112__} \
%{mmcu=msp430x122:%(cpp_msp1) -D__MSP430_122__} \
%{mmcu=msp430x1222:%(cpp_msp1) -D__MSP430_1222__} \
%{mmcu=msp430x123:%(cpp_msp1) -D__MSP430_123__} \
%{mmcu=msp430x1232:%(cpp_msp1) -D__MSP430_1232__} \
+%{mmcu=msp430x1122:%(cpp_msp1) -D__MSP430_1122__} \
+%{mmcu=msp430x1132:%(cpp_msp1) -D__MSP430_1132__} \
%{mmcu=msp430x133:%(cpp_msp1) -D__MSP430_133__} \
%{mmcu=msp430x135:%(cpp_msp1) -D__MSP430_135__} \
%{mmcu=msp430x147:%(cpp_msp2) -D__MSP430_147__} \
%{mmcu=msp430x148:%(cpp_msp2) -D__MSP430_148__} \
%{mmcu=msp430x149:%(cpp_msp2) -D__MSP430_149__} \
@@ -2885,14 +2884,10 @@
Normally, this is not needed. See the file `mips.h' for an
example of this.
Do not define this macro if it does not need to do anything. */
-/* recently added:
-1331, 1351, 435, 436, 437, 447, 448, 449 */
-
-
#define LINK_SPEC "\
%{!mmcu*:-m msp430x110} \
%{mmcu=msp1:-m msp430x110} \
%{mmcu=msp2:-m msp430x336} \
%{mmcu=msp430x1101:-m msp430x1101 } \
@@ -2910,10 +2905,12 @@
%{mmcu=msp430x112:-m msp430x112 } \
%{mmcu=msp430x122:-m msp430x122 } \
%{mmcu=msp430x1222:-m msp430x1222 } \
%{mmcu=msp430x123:-m msp430x123 } \
%{mmcu=msp430x1232:-m msp430x1232 } \
+%{mmcu=msp430x1122:-m msp430x1122 } \
+%{mmcu=msp430x1132:-m msp430x1132 } \
%{mmcu=msp430x133:-m msp430x133 } \
%{mmcu=msp430x135:-m msp430x135 } \
%{mmcu=msp430x147:-m msp430x147 } \
%{mmcu=msp430x148:-m msp430x148 } \
%{mmcu=msp430x149:-m msp430x149 } \
@@ -2990,10 +2987,12 @@
%{mmcu=msp430x112:crt430x112.o%s} \
%{mmcu=msp430x122:crt430x122.o%s} \
%{mmcu=msp430x1222:crt430x1222.o%s} \
%{mmcu=msp430x123:crt430x123.o%s} \
%{mmcu=msp430x1232:crt430x1232.o%s} \
+%{mmcu=msp430x1122:crt430x1122.o%s} \
+%{mmcu=msp430x1132:crt430x1132.o%s} \
%{mmcu=msp430x133:crt430x133.o%s} \
%{mmcu=msp430x135:crt430x135.o%s} \
%{mmcu=msp430x147:crt430x147.o%s} \
%{mmcu=msp430x148:crt430x148.o%s} \
%{mmcu=msp430x149:crt430x149.o%s} \
diff -rU5 gcc-3.2.2.orig/gcc/config/msp430/t-msp430
gcc-3.2.2/gcc/config/msp430/t-msp430
--- gcc-3.2.2.orig/gcc/config/msp430/t-msp430 2003-03-03 23:46:46.000000000
+0800
+++ gcc-3.2.2/gcc/config/msp430/t-msp430 2003-03-04 12:20:10.000000000
+0800
@@ -71,10 +71,11 @@
mmcu?msp1=mmcu?msp430x314 mmcu?msp1=mmcu?msp430x311 \
mmcu?msp1=mmcu?msp430x313 mmcu?msp1=mmcu?msp430x312 \
mmcu?msp1=mmcu?msp430x314 mmcu?msp1=mmcu?msp430x323 \
mmcu?msp1=mmcu?msp430x325 mmcu?msp1=mmcu?msp430x1222
mmcu?msp1=mmcu?msp430x1232 \
mmcu?msp1=mmcu?msp430x1101 mmcu?msp1=mmcu?msp430x1111
mmcu?msp1=mmcu?msp430x1121 \
+ mmcu?msp1=mmcu?msp430x1122 mmcu?msp1=mmcu?msp430x1132 \
mmcu?msp1=mmcu?msp430x1331 mmcu?msp1=mmcu?msp430x1351 \
mmcu?msp2=mmcu?msp430x449 mmcu?msp2=mmcu?msp430x448
mmcu?msp2=mmcu?msp430x447 \
mmcu?msp1=mmcu?msp430x435 mmcu?msp1=mmcu?msp430x436
mmcu?msp1=mmcu?msp430x437
MULTILIB_EXCEPTIONS =
--- binutils-030303.orig/gas/config/tc-msp430.c Tue Mar 4 12:02:22 2003
+++ binutils-030303/gas/config/tc-msp430.c Tue Mar 4 12:02:34 2003
@@ -91,10 +91,12 @@
{
{"msp1", MSP430_ISA_11, bfd_mach_msp11},
{"msp2", MSP430_ISA_14, bfd_mach_msp14},
{"msp430x110", MSP430_ISA_11, bfd_mach_msp11},
{"msp430x112", MSP430_ISA_11, bfd_mach_msp11},
+ {"msp430x1122",MSP430_ISA_11, bfd_mach_msp110},
+ {"msp430x1132",MSP430_ISA_11, bfd_mach_msp110},
{"msp430x122", MSP430_ISA_12, bfd_mach_msp12},
{"msp430x122", MSP430_ISA_12, bfd_mach_msp12},
{"msp430x1222",MSP430_ISA_12, bfd_mach_msp12},
{"msp430x123", MSP430_ISA_12, bfd_mach_msp12},
{"msp430x1232",MSP430_ISA_12, bfd_mach_msp12},
@@ -119,10 +121,11 @@
{"msp430x1121",MSP430_ISA_110, bfd_mach_msp110},
{"msp430x1331",MSP430_ISA_13, bfd_mach_msp13},
{"msp430x1351",MSP430_ISA_13, bfd_mach_msp13},
{"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},
@@ -177,25 +180,26 @@
FILE *stream;
{
fprintf (stream,
_("MSP430 options:\n"
" -mmcu=[msp430-name] select microcontroller type\n"
- " msp430x1101 msp430x1111 msp430x1121\n"
- " msp430x1331 msp430x1351\n"
+ " msp430x110 msp430x112\n"
+ " msp430x1101 msp430x1111\n"
+ " msp430x1121 msp430x1122 msp430x1132\n"
+ " msp430x122 msp430x123\n"
" msp430x1222 msp430x1232\n"
- " msp430x311 msp430x312 msp430x313 msp430x314
msp430x315\n"
- " msp430x323 msp430x325\n"
- " msp430x336 msp430x337\n"
- " msp430x412 msp430x413\n"
- " msp430x110 msp430x112\n"
- " msp430x122 msp430x123\n"
- " msp430x133 msp430x135\n"
- " msp430x147 msp430x148 msp430x149\n"
- " msp430x167 msp430x168 msp430x169\n"
- " msp430x155 msp430x156 msp430x157\n"
- " msp430x447 msp430x448 msp430x449\n"
- " msp430x435 msp430x436\n"));
+ " msp430x133 msp430x135\n"
+ " msp430x1331 msp430x1351\n"
+ " msp430x147 msp430x148 msp430x149\n"
+ " msp430x155 msp430x156 msp430x157\n"
+ " msp430x167 msp430x168 msp430x169\n"
+ " msp430x311 msp430x312 msp430x313 msp430x314
msp430x315\n"
+ " msp430x323 msp430x325\n"
+ " msp430x336 msp430x337\n"
+ " msp430x412 msp430x413\n"
+ " msp430x435 msp430x436 msp430x437\n"
+ " msp430x447 msp430x448 msp430x449\n"));
show_mcu_list (stream);
}
static char *
