summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bfd/ChangeLog7
-rw-r--r--bfd/archures.c9
-rw-r--r--bfd/bfd-in2.h9
-rw-r--r--bfd/cpu-msp430.c40
-rw-r--r--bfd/elf32-msp430.c68
-rwxr-xr-xconfig.sub4
-rw-r--r--gas/ChangeLog5
-rw-r--r--gas/config/tc-msp430.c55
-rw-r--r--include/elf/ChangeLog5
-rw-r--r--include/elf/msp430.h7
-rw-r--r--ld/ChangeLog13
-rw-r--r--ld/Makefile.am175
-rw-r--r--ld/Makefile.in181
-rw-r--r--ld/configure.tgt4
-rw-r--r--ld/emulparams/msp430xE423.sh14
-rw-r--r--ld/emulparams/msp430xE425.sh14
-rw-r--r--ld/emulparams/msp430xE427.sh14
-rw-r--r--ld/emulparams/msp430xW423.sh14
-rw-r--r--ld/emulparams/msp430xW425.sh14
-rw-r--r--ld/emulparams/msp430xW427.sh14
20 files changed, 435 insertions, 231 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 13bfca62ebd..f3070c79763 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2003-08-08 Dmitry Diky <diwil@mail.ru>
+
+ * archures.c: Add xW42 and xE42 parts. Sort MPU list according to gcc order.
+ * cpu-msp430.c: Likewise.
+ * elf32-msp430.c: Likewise.
+ * bfd-in2.h: Regenerate.
+
2003-08-07 Alan Modra <amodra@bigpond.net.au>
* elfxx-target.h: Remove PTR cast.
diff --git a/bfd/archures.c b/bfd/archures.c
index 77f6a9e6e13..407cd263141 100644
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -301,19 +301,20 @@ DESCRIPTION
. bfd_arch_xstormy16,
.#define bfd_mach_xstormy16 1
. bfd_arch_msp430, {* Texas Instruments MSP430 architecture. *}
-.#define bfd_mach_msp110 110
.#define bfd_mach_msp11 11
+.#define bfd_mach_msp110 110
.#define bfd_mach_msp12 12
.#define bfd_mach_msp13 13
.#define bfd_mach_msp14 14
-.#define bfd_mach_msp41 41
+.#define bfd_mach_msp15 15
+.#define bfd_mach_msp16 16
.#define bfd_mach_msp31 31
.#define bfd_mach_msp32 32
.#define bfd_mach_msp33 33
+.#define bfd_mach_msp41 41
+.#define bfd_mach_msp42 42
.#define bfd_mach_msp43 43
.#define bfd_mach_msp44 44
-.#define bfd_mach_msp15 15
-.#define bfd_mach_msp16 16
. bfd_arch_xtensa, {* Tensilica's Xtensa cores. *}
.#define bfd_mach_xtensa 1
. bfd_arch_last
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 0479814767b..bab08097727 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1731,19 +1731,20 @@ enum bfd_architecture
bfd_arch_xstormy16,
#define bfd_mach_xstormy16 1
bfd_arch_msp430, /* Texas Instruments MSP430 architecture. */
-#define bfd_mach_msp110 110
#define bfd_mach_msp11 11
+#define bfd_mach_msp110 110
#define bfd_mach_msp12 12
#define bfd_mach_msp13 13
#define bfd_mach_msp14 14
-#define bfd_mach_msp41 41
+#define bfd_mach_msp15 15
+#define bfd_mach_msp16 16
#define bfd_mach_msp31 31
#define bfd_mach_msp32 32
#define bfd_mach_msp33 33
+#define bfd_mach_msp41 41
+#define bfd_mach_msp42 42
#define bfd_mach_msp43 43
#define bfd_mach_msp44 44
-#define bfd_mach_msp15 15
-#define bfd_mach_msp16 16
bfd_arch_xtensa, /* Tensilica's Xtensa cores. */
#define bfd_mach_xtensa 1
bfd_arch_last
diff --git a/bfd/cpu-msp430.c b/bfd/cpu-msp430.c
index c7d283b63bb..54ed649a34b 100644
--- a/bfd/cpu-msp430.c
+++ b/bfd/cpu-msp430.c
@@ -46,42 +46,44 @@ static const bfd_arch_info_type arch_info_struct[] =
/* msp430x11x. */
N (16, bfd_mach_msp11, "msp:11", FALSE, & arch_info_struct[1]),
+ /* msp430x11x1. */
+ N (16, bfd_mach_msp110, "msp:110", FALSE, & arch_info_struct[2]),
+
/* msp430x12x. */
- N (16, bfd_mach_msp12, "msp:12", FALSE, & arch_info_struct[2]),
+ N (16, bfd_mach_msp12, "msp:12", FALSE, & arch_info_struct[3]),
/* msp430x13x. */
- N (16, bfd_mach_msp13, "msp:13", FALSE, & arch_info_struct[3]),
+ N (16, bfd_mach_msp13, "msp:13", FALSE, & arch_info_struct[4]),
/* msp430x14x. */
- N (16, bfd_mach_msp14, "msp:14", FALSE, & arch_info_struct[4]),
+ N (16, bfd_mach_msp14, "msp:14", FALSE, & arch_info_struct[5]),
+
+ /* msp430x15x. */
+ N (16, bfd_mach_msp15, "msp:15", FALSE, & arch_info_struct[6]),
+
+ /* msp430x16x. */
+ N (16, bfd_mach_msp16, "msp:16", FALSE, & arch_info_struct[7]),
/* msp430x31x. */
- N (16, bfd_mach_msp31, "msp:31", FALSE, & arch_info_struct[5]),
+ N (16, bfd_mach_msp31, "msp:31", FALSE, & arch_info_struct[8]),
/* msp430x32x. */
- N (16, bfd_mach_msp32, "msp:32", FALSE, & arch_info_struct[6]),
+ N (16, bfd_mach_msp32, "msp:32", FALSE, & arch_info_struct[9]),
/* msp430x33x. */
- N (16, bfd_mach_msp33, "msp:33", FALSE, & arch_info_struct[7]),
+ N (16, bfd_mach_msp33, "msp:33", FALSE, & arch_info_struct[10]),
/* msp430x41x. */
- N (16, bfd_mach_msp41, "msp:41", FALSE, & arch_info_struct[8]),
+ N (16, bfd_mach_msp41, "msp:41", FALSE, & arch_info_struct[11]),
+
+ /* msp430x42x. */
+ N (16, bfd_mach_msp42, "msp:42", FALSE, & arch_info_struct[12]),
/* msp430x43x. */
- N (16, bfd_mach_msp43, "msp:43", FALSE, & arch_info_struct[9]),
+ N (16, bfd_mach_msp43, "msp:43", FALSE, & arch_info_struct[13]),
/* msp430x44x. */
- N (16, bfd_mach_msp43, "msp:44", FALSE, & arch_info_struct[10]),
-
- /* msp430x15x. */
- N (16, bfd_mach_msp15, "msp:15", FALSE, & arch_info_struct[11]),
-
- /* msp430x16x. */
- N (16, bfd_mach_msp16, "msp:16", FALSE, & arch_info_struct[12]),
-
- /* msp430x11x1. */
- N (16, bfd_mach_msp110, "msp:110", FALSE, NULL)
-
+ N (16, bfd_mach_msp43, "msp:44", FALSE, NULL)
};
const bfd_arch_info_type bfd_msp430_arch =
diff --git a/bfd/elf32-msp430.c b/bfd/elf32-msp430.c
index 23f5069cb19..b09ef873cb1 100644
--- a/bfd/elf32-msp430.c
+++ b/bfd/elf32-msp430.c
@@ -550,10 +550,6 @@ bfd_elf_msp430_final_write_processing (abfd, linker)
switch (bfd_get_mach (abfd))
{
default:
- case bfd_mach_msp12:
- val = E_MSP430_MACH_MSP430x12;
- break;
-
case bfd_mach_msp110:
val = E_MSP430_MACH_MSP430x11x1;
break;
@@ -562,6 +558,10 @@ bfd_elf_msp430_final_write_processing (abfd, linker)
val = E_MSP430_MACH_MSP430x11;
break;
+ case bfd_mach_msp12:
+ val = E_MSP430_MACH_MSP430x12;
+ break;
+
case bfd_mach_msp13:
val = E_MSP430_MACH_MSP430x13;
break;
@@ -570,16 +570,12 @@ bfd_elf_msp430_final_write_processing (abfd, linker)
val = E_MSP430_MACH_MSP430x14;
break;
- case bfd_mach_msp41:
- val = E_MSP430_MACH_MSP430x41;
- break;
-
- case bfd_mach_msp43:
- val = E_MSP430_MACH_MSP430x43;
+ case bfd_mach_msp15:
+ val = E_MSP430_MACH_MSP430x15;
break;
- case bfd_mach_msp44:
- val = E_MSP430_MACH_MSP430x44;
+ case bfd_mach_msp16:
+ val = E_MSP430_MACH_MSP430x16;
break;
case bfd_mach_msp31:
@@ -594,12 +590,20 @@ bfd_elf_msp430_final_write_processing (abfd, linker)
val = E_MSP430_MACH_MSP430x33;
break;
- case bfd_mach_msp15:
- val = E_MSP430_MACH_MSP430x15;
+ case bfd_mach_msp41:
+ val = E_MSP430_MACH_MSP430x41;
break;
- case bfd_mach_msp16:
- val = E_MSP430_MACH_MSP430x16;
+ case bfd_mach_msp42:
+ val = E_MSP430_MACH_MSP430x42;
+ break;
+
+ case bfd_mach_msp43:
+ val = E_MSP430_MACH_MSP430x43;
+ break;
+
+ case bfd_mach_msp44:
+ val = E_MSP430_MACH_MSP430x44;
break;
}
@@ -624,10 +628,6 @@ elf32_msp430_object_p (abfd)
switch (e_mach)
{
default:
- case E_MSP430_MACH_MSP430x12:
- e_set = bfd_mach_msp12;
- break;
-
case E_MSP430_MACH_MSP430x11:
e_set = bfd_mach_msp11;
break;
@@ -636,6 +636,10 @@ elf32_msp430_object_p (abfd)
e_set = bfd_mach_msp110;
break;
+ case E_MSP430_MACH_MSP430x12:
+ e_set = bfd_mach_msp12;
+ break;
+
case E_MSP430_MACH_MSP430x13:
e_set = bfd_mach_msp13;
break;
@@ -644,8 +648,12 @@ elf32_msp430_object_p (abfd)
e_set = bfd_mach_msp14;
break;
- case E_MSP430_MACH_MSP430x41:
- e_set = bfd_mach_msp41;
+ case E_MSP430_MACH_MSP430x15:
+ e_set = bfd_mach_msp15;
+ break;
+
+ case E_MSP430_MACH_MSP430x16:
+ e_set = bfd_mach_msp16;
break;
case E_MSP430_MACH_MSP430x31:
@@ -660,20 +668,20 @@ elf32_msp430_object_p (abfd)
e_set = bfd_mach_msp33;
break;
- case E_MSP430_MACH_MSP430x43:
- e_set = bfd_mach_msp43;
+ case E_MSP430_MACH_MSP430x41:
+ e_set = bfd_mach_msp41;
break;
- case E_MSP430_MACH_MSP430x44:
- e_set = bfd_mach_msp44;
+ case E_MSP430_MACH_MSP430x42:
+ e_set = bfd_mach_msp42;
break;
- case E_MSP430_MACH_MSP430x15:
- e_set = bfd_mach_msp15;
+ case E_MSP430_MACH_MSP430x43:
+ e_set = bfd_mach_msp43;
break;
- case E_MSP430_MACH_MSP430x16:
- e_set = bfd_mach_msp16;
+ case E_MSP430_MACH_MSP430x44:
+ e_set = bfd_mach_msp44;
break;
}
}
diff --git a/config.sub b/config.sub
index 725707f709a..dfeed485c2b 100755
--- a/config.sub
+++ b/config.sub
@@ -234,7 +234,7 @@ case $basic_machine in
| fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
- | ip2k \
+ | iq2000 | ip2k \
| m32r | m68000 | m68k | m88k | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
@@ -304,7 +304,7 @@ case $basic_machine in
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* \
+ | iq2000-* | ip2k-* \
| m32r-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | mcore-* \
diff --git a/gas/ChangeLog b/gas/ChangeLog
index bc9f7513c0d..b1cf375c550 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-08 Dmitry Diky <diwil@mail.ru>
+
+ * config/tc-msp430.c: Add xW42 and xE42 parts. Sort MPU list
+ according to gcc order.
+
2003-08-07 Jason Eckhardt <jle@rice.edu>
* config/tc-i860.c (i860_check_label): New function.
diff --git a/gas/config/tc-msp430.c b/gas/config/tc-msp430.c
index 60728eef403..0f8e32ff352 100644
--- a/gas/config/tc-msp430.c
+++ b/gas/config/tc-msp430.c
@@ -71,18 +71,19 @@ struct mcu_type_s
};
#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,32 @@ static struct mcu_type_s mcu_types[] =
{"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},
+
{"msp430x311", MSP430_ISA_31, bfd_mach_msp31},
{"msp430x312", MSP430_ISA_31, bfd_mach_msp31},
{"msp430x313", MSP430_ISA_31, bfd_mach_msp31},
@@ -116,23 +129,23 @@ static struct mcu_type_s mcu_types[] =
{"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},
+
+ {"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}
};
@@ -196,6 +209,8 @@ md_show_usage (stream)
" msp430x323 msp430x325\n"
" msp430x336 msp430x337\n"
" msp430x412 msp430x413\n"
+ " msp430xE423 msp430xE425 msp430E427\n"
+ " msp430xW423 msp430xW425 msp430W427\n"
" msp430x435 msp430x436 msp430x437\n"
" msp430x447 msp430x448 msp430x449\n"));
diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index 90f525c7804..7d9ef0ccddc 100644
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-08 Dmitry Diky <diwil@mail.ru>
+
+ * msp430.h: Add xW42 and xE42 parts. Sort MPU list according to
+ gcc order.
+
2003-08-07 Alan Modra <amodra@bigpond.net.au>
* reloc-macros.h (START_RELOC_NUMBERS) : Remove PARAMS macro. Use
diff --git a/include/elf/msp430.h b/include/elf/msp430.h
index cb3f241dea1..912ded7685d 100644
--- a/include/elf/msp430.h
+++ b/include/elf/msp430.h
@@ -26,19 +26,20 @@
/* Processor specific flags for the ELF header e_flags field. */
#define EF_MSP430_MACH 0xff
-#define E_MSP430_MACH_MSP430x11x1 110
#define E_MSP430_MACH_MSP430x11 11
+#define E_MSP430_MACH_MSP430x11x1 110
#define E_MSP430_MACH_MSP430x12 12
#define E_MSP430_MACH_MSP430x13 13
#define E_MSP430_MACH_MSP430x14 14
+#define E_MSP430_MACH_MSP430x15 15
+#define E_MSP430_MACH_MSP430x16 16
#define E_MSP430_MACH_MSP430x31 31
#define E_MSP430_MACH_MSP430x32 32
#define E_MSP430_MACH_MSP430x33 33
#define E_MSP430_MACH_MSP430x41 41
+#define E_MSP430_MACH_MSP430x42 42
#define E_MSP430_MACH_MSP430x43 43
#define E_MSP430_MACH_MSP430x44 44
-#define E_MSP430_MACH_MSP430x15 15
-#define E_MSP430_MACH_MSP430x16 16
/* Relocations. */
START_RELOC_NUMBERS (elf_msp430_reloc_type)
diff --git a/ld/ChangeLog b/ld/ChangeLog
index b88715dc8ee..3c520af758e 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,16 @@
+2003-08-08 Dmitry Diky <diwil@mail.ru>
+
+ * Makefile.am: Add xW42 and xE42 parts. Sort MPU list according to
+ gcc order.
+ * Makefile.in: Regenerate.
+ * configure.tgt: Add extra emulations.
+ * emulparams/msp430xE423.sh: New file.
+ * emulparams/msp430xE427.sh: New file.
+ * emulparams/msp430xW425.sh: New file.
+ * emulparams/msp430xE425.sh: New file.
+ * emulparams/msp430xW423.sh: New file.
+ * emulparams/msp430xW427.sh: New file.
+
2003-08-07 Danny Smith <dannysmith@users.sourceforge.net>
* emultempl/pe.em (gld_${EMULATION_NAME}_before_parse):
diff --git a/ld/Makefile.am b/ld/Makefile.am
index c00db10b538..3a04c4ea426 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -260,26 +260,30 @@ ALL_EMULATIONS = \
emipslit.o \
emipslnews.o \
emipspe.o \
+ emsp430x110.o \
+ emsp430x112.o \
emsp430x1101.o \
emsp430x1111.o \
emsp430x1121.o \
emsp430x1122.o \
emsp430x1132.o \
- emsp430x1331.o \
- emsp430x1351.o \
- emsp430x149.o \
- emsp430x148.o \
- emsp430x147.o \
- emsp430x135.o \
- emsp430x133.o \
- emsp430x110.o \
- emsp430x112.o \
emsp430x122.o \
- emsp430x1222.o \
emsp430x123.o \
+ emsp430x1222.o \
emsp430x1232.o \
- emsp430x412.o \
- emsp430x413.o \
+ emsp430x133.o \
+ emsp430x135.o \
+ emsp430x1331.o \
+ emsp430x1351.o \
+ emsp430x147.o \
+ emsp430x148.o \
+ emsp430x149.o \
+ emsp430x155.o \
+ emsp430x156.o \
+ emsp430x157.o \
+ emsp430x167.o \
+ emsp430x168.o \
+ emsp430x169.o \
emsp430x311.o \
emsp430x312.o \
emsp430x313.o \
@@ -289,17 +293,20 @@ ALL_EMULATIONS = \
emsp430x325.o \
emsp430x336.o \
emsp430x337.o \
+ emsp430x412.o \
+ emsp430x413.o \
+ emsp430xE423.o \
+ emsp430xE425.o \
+ emsp430xE427.o \
+ emsp430xW423.o \
+ emsp430xW425.o \
+ emsp430xW427.o \
emsp430x435.o \
emsp430x436.o \
+ emsp430x437.o \
emsp430x447.o \
emsp430x448.o \
emsp430x449.o \
- emsp430x169.o \
- emsp430x168.o \
- emsp430x167.o \
- emsp430x155.o \
- emsp430x156.o \
- emsp430x157.o \
enews.o \
ens32knbsd.o \
eor32.o \
@@ -1065,6 +1072,14 @@ emn10300.c: $(srcdir)/emulparams/mn10300.sh \
emn10200.c: $(srcdir)/emulparams/mn10200.sh \
$(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
${GENSCRIPTS} mn10200 "$(tdir_mn10200)"
+emsp430x110.c: $(srcdir)/emulparams/msp430x110.sh \
+ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
+ ${GEN_DEPENDS}
+ ${GENSCRIPTS} msp430x110 "$(tdir_msp430x110)"
+emsp430x112.c: $(srcdir)/emulparams/msp430x112.sh \
+ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
+ ${GEN_DEPENDS}
+ ${GENSCRIPTS} msp430x112 "$(tdir_msp430x112)"
emsp430x1101.c: $(srcdir)/emulparams/msp430x1101.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
@@ -1085,78 +1100,74 @@ emsp430x1132.c: $(srcdir)/emulparams/msp430x1132.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
${GENSCRIPTS} msp430x1132 "$(tdir_msp430x1132)"
-emsp430x1331.c: $(srcdir)/emulparams/msp430x1331.sh \
- $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
- ${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x1331 "$(tdir_msp430x1331)"
-emsp430x1351.c: $(srcdir)/emulparams/msp430x1351.sh \
+emsp430x122.c: $(srcdir)/emulparams/msp430x122.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x1351 "$(tdir_msp430x1351)"
-emsp430x149.c: $(srcdir)/emulparams/msp430x149.sh \
+ ${GENSCRIPTS} msp430x122 "$(tdir_msp430x122)"
+emsp430x123.c: $(srcdir)/emulparams/msp430x123.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x149 "$(tdir_msp430x149)"
-emsp430x148.c: $(srcdir)/emulparams/msp430x148.sh \
+ ${GENSCRIPTS} msp430x123 "$(tdir_msp430x123)"
+emsp430x1222.c: $(srcdir)/emulparams/msp430x1222.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x148 "$(tdir_msp430x148)"
-emsp430x449.c: $(srcdir)/emulparams/msp430x449.sh \
+ ${GENSCRIPTS} msp430x1222 "$(tdir_msp430x1222)"
+emsp430x1232.c: $(srcdir)/emulparams/msp430x1232.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x449 "$(tdir_msp430x449)"
-emsp430x448.c: $(srcdir)/emulparams/msp430x448.sh \
+ ${GENSCRIPTS} msp430x1232 "$(tdir_msp430x1232)"
+emsp430x133.c: $(srcdir)/emulparams/msp430x133.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x448 "$(tdir_msp430x448)"
-emsp430x447.c: $(srcdir)/emulparams/msp430x447.sh \
+ ${GENSCRIPTS} msp430x133 "$(tdir_msp430x133)"
+emsp430x135.c: $(srcdir)/emulparams/msp430x135.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x447 "$(tdir_msp430x447)"
-emsp430x412.c: $(srcdir)/emulparams/msp430x412.sh \
+ ${GENSCRIPTS} msp430x135 "$(tdir_msp430x135)"
+emsp430x1331.c: $(srcdir)/emulparams/msp430x1331.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x412 "$(tdir_msp430x412)"
-emsp430x413.c: $(srcdir)/emulparams/msp430x413.sh \
+ ${GENSCRIPTS} msp430x1331 "$(tdir_msp430x1331)"
+emsp430x1351.c: $(srcdir)/emulparams/msp430x1351.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x413 "$(tdir_msp430x413)"
+ ${GENSCRIPTS} msp430x1351 "$(tdir_msp430x1351)"
emsp430x147.c: $(srcdir)/emulparams/msp430x147.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
${GENSCRIPTS} msp430x147 "$(tdir_msp430x147)"
-emsp430x135.c: $(srcdir)/emulparams/msp430x135.sh \
+emsp430x148.c: $(srcdir)/emulparams/msp430x148.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x135 "$(tdir_msp430x135)"
-emsp430x133.c: $(srcdir)/emulparams/msp430x133.sh \
+ ${GENSCRIPTS} msp430x148 "$(tdir_msp430x148)"
+emsp430x149.c: $(srcdir)/emulparams/msp430x149.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x133 "$(tdir_msp430x133)"
-emsp430x110.c: $(srcdir)/emulparams/msp430x110.sh \
+ ${GENSCRIPTS} msp430x149 "$(tdir_msp430x149)"
+emsp430x155.c: $(srcdir)/emulparams/msp430x155.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x110 "$(tdir_msp430x110)"
-emsp430x112.c: $(srcdir)/emulparams/msp430x112.sh \
+ ${GENSCRIPTS} msp430x155 "$(tdir_msp430x155)"
+emsp430x156.c: $(srcdir)/emulparams/msp430x156.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x112 "$(tdir_msp430x112)"
-emsp430x122.c: $(srcdir)/emulparams/msp430x122.sh \
+ ${GENSCRIPTS} msp430x156 "$(tdir_msp430x156)"
+emsp430x157.c: $(srcdir)/emulparams/msp430x157.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x122 "$(tdir_msp430x122)"
-emsp430x1222.c: $(srcdir)/emulparams/msp430x1222.sh \
+ ${GENSCRIPTS} msp430x157 "$(tdir_msp430x157)"
+emsp430x167.c: $(srcdir)/emulparams/msp430x167.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x1222 "$(tdir_msp430x1222)"
-emsp430x123.c: $(srcdir)/emulparams/msp430x123.sh \
+ ${GENSCRIPTS} msp430x167 "$(tdir_msp430x167)"
+emsp430x168.c: $(srcdir)/emulparams/msp430x167.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x123 "$(tdir_msp430x123)"
-emsp430x1232.c: $(srcdir)/emulparams/msp430x1232.sh \
+ ${GENSCRIPTS} msp430x168 "$(tdir_msp430x168)"
+emsp430x169.c: $(srcdir)/emulparams/msp430x169.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x1232 "$(tdir_msp430x1232)"
+ ${GENSCRIPTS} msp430x169 "$(tdir_msp430x169)"
emsp430x311.c: $(srcdir)/emulparams/msp430x311.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430_3.sc \
${GEN_DEPENDS}
@@ -1193,42 +1204,62 @@ emsp430x337.c: $(srcdir)/emulparams/msp430x337.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430_3.sc \
${GEN_DEPENDS}
${GENSCRIPTS} msp430x337 "$(tdir_msp430x337)"
-emsp430x435.c: $(srcdir)/emulparams/msp430x435.sh \
+emsp430x412.c: $(srcdir)/emulparams/msp430x412.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x435 "$(tdir_msp430x435)"
-emsp430x436.c: $(srcdir)/emulparams/msp430x436.sh \
+ ${GENSCRIPTS} msp430x412 "$(tdir_msp430x412)"
+emsp430x413.c: $(srcdir)/emulparams/msp430x413.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x436 "$(tdir_msp430x436)"
-emsp430x437.c: $(srcdir)/emulparams/msp430x437.sh \
+ ${GENSCRIPTS} msp430x413 "$(tdir_msp430x413)"
+emsp430xE423.c: $(srcdir)/emulparams/msp430xE423.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x437 "$(tdir_msp430x437)"
-emsp430x167.c: $(srcdir)/emulparams/msp430x167.sh \
+ ${GENSCRIPTS} msp430xE423 "$(tdir_msp430xE423)"
+emsp430xE425.c: $(srcdir)/emulparams/msp430xE425.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x167 "$(tdir_msp430x167)"
-emsp430x168.c: $(srcdir)/emulparams/msp430x167.sh \
+ ${GENSCRIPTS} msp430xE425 "$(tdir_msp430xE425)"
+emsp430xE427.c: $(srcdir)/emulparams/msp430xE427.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x168 "$(tdir_msp430x168)"
-emsp430x169.c: $(srcdir)/emulparams/msp430x169.sh \
+ ${GENSCRIPTS} msp430xE427 "$(tdir_msp430xE427)"
+emsp430xW423.c: $(srcdir)/emulparams/msp430xW423.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x169 "$(tdir_msp430x169)"
-emsp430x155.c: $(srcdir)/emulparams/msp430x155.sh \
+ ${GENSCRIPTS} msp430xW423 "$(tdir_msp430xW423)"
+emsp430xW425.c: $(srcdir)/emulparams/msp430xW425.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x155 "$(tdir_msp430x155)"
-emsp430x156.c: $(srcdir)/emulparams/msp430x156.sh \
+ ${GENSCRIPTS} msp430xW425 "$(tdir_msp430xW425)"
+emsp430xW427.c: $(srcdir)/emulparams/msp430xW427.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x156 "$(tdir_msp430x156)"
-emsp430x157.c: $(srcdir)/emulparams/msp430x157.sh \
+ ${GENSCRIPTS} msp430xW427 "$(tdir_msp430xW427)"
+emsp430x435.c: $(srcdir)/emulparams/msp430x435.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x157 "$(tdir_msp430x157)"
+ ${GENSCRIPTS} msp430x435 "$(tdir_msp430x435)"
+emsp430x436.c: $(srcdir)/emulparams/msp430x436.sh \
+ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
+ ${GEN_DEPENDS}
+ ${GENSCRIPTS} msp430x436 "$(tdir_msp430x436)"
+emsp430x437.c: $(srcdir)/emulparams/msp430x437.sh \
+ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
+ ${GEN_DEPENDS}
+ ${GENSCRIPTS} msp430x437 "$(tdir_msp430x437)"
+emsp430x447.c: $(srcdir)/emulparams/msp430x447.sh \
+ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
+ ${GEN_DEPENDS}
+ ${GENSCRIPTS} msp430x447 "$(tdir_msp430x447)"
+emsp430x448.c: $(srcdir)/emulparams/msp430x448.sh \
+ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
+ ${GEN_DEPENDS}
+ ${GENSCRIPTS} msp430x448 "$(tdir_msp430x448)"
+emsp430x449.c: $(srcdir)/emulparams/msp430x449.sh \
+ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
+ ${GEN_DEPENDS}
+ ${GENSCRIPTS} msp430x449 "$(tdir_msp430x449)"
enews.c: $(srcdir)/emulparams/news.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
${GENSCRIPTS} news "$(tdir_news)"
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 3b0c0d52875..9f0b3845dee 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
@@ -374,26 +374,30 @@ ALL_EMULATIONS = \
emipslit.o \
emipslnews.o \
emipspe.o \
+ emsp430x110.o \
+ emsp430x112.o \
emsp430x1101.o \
emsp430x1111.o \
emsp430x1121.o \
emsp430x1122.o \
emsp430x1132.o \
- emsp430x1331.o \
- emsp430x1351.o \
- emsp430x149.o \
- emsp430x148.o \
- emsp430x147.o \
- emsp430x135.o \
- emsp430x133.o \
- emsp430x110.o \
- emsp430x112.o \
emsp430x122.o \
- emsp430x1222.o \
emsp430x123.o \
+ emsp430x1222.o \
emsp430x1232.o \
- emsp430x412.o \
- emsp430x413.o \
+ emsp430x133.o \
+ emsp430x135.o \
+ emsp430x1331.o \
+ emsp430x1351.o \
+ emsp430x147.o \
+ emsp430x148.o \
+ emsp430x149.o \
+ emsp430x155.o \
+ emsp430x156.o \
+ emsp430x157.o \
+ emsp430x167.o \
+ emsp430x168.o \
+ emsp430x169.o \
emsp430x311.o \
emsp430x312.o \
emsp430x313.o \
@@ -403,17 +407,20 @@ ALL_EMULATIONS = \
emsp430x325.o \
emsp430x336.o \
emsp430x337.o \
+ emsp430x412.o \
+ emsp430x413.o \
+ emsp430xE423.o \
+ emsp430xE425.o \
+ emsp430xE427.o \
+ emsp430xW423.o \
+ emsp430xW425.o \
+ emsp430xW427.o \
emsp430x435.o \
emsp430x436.o \
+ emsp430x437.o \
emsp430x447.o \
emsp430x448.o \
emsp430x449.o \
- emsp430x169.o \
- emsp430x168.o \
- emsp430x167.o \
- emsp430x155.o \
- emsp430x156.o \
- emsp430x157.o \
enews.o \
ens32knbsd.o \
eor32.o \
@@ -598,7 +605,7 @@ deffilep.c ldgram.c ldlex.c
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-TAR = tar
+TAR = gtar
GZIP_ENV = --best
SOURCES = $(ld_new_SOURCES) $(EXTRA_ld_new_SOURCES)
OBJECTS = $(ld_new_OBJECTS)
@@ -1080,7 +1087,7 @@ distclean-generic:
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
- -test -z "ldlex.cdeffilep.hdeffilep.cldgram.hldgram.c$(MAINTAINERCLEANFILES)" || rm -f ldlex.c deffilep.h deffilep.c ldgram.h ldgram.c $(MAINTAINERCLEANFILES)
+ -test -z "ldlexldeffilephdeffilepcldgramhldgramc$(MAINTAINERCLEANFILES)" || rm -f ldlexl deffileph deffilepc ldgramh ldgramc $(MAINTAINERCLEANFILES)
mostlyclean-am: mostlyclean-hdr mostlyclean-noinstPROGRAMS \
mostlyclean-compile mostlyclean-libtool \
mostlyclean-aminfo mostlyclean-tags mostlyclean-generic \
@@ -1791,6 +1798,14 @@ emn10300.c: $(srcdir)/emulparams/mn10300.sh \
emn10200.c: $(srcdir)/emulparams/mn10200.sh \
$(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
${GENSCRIPTS} mn10200 "$(tdir_mn10200)"
+emsp430x110.c: $(srcdir)/emulparams/msp430x110.sh \
+ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
+ ${GEN_DEPENDS}
+ ${GENSCRIPTS} msp430x110 "$(tdir_msp430x110)"
+emsp430x112.c: $(srcdir)/emulparams/msp430x112.sh \
+ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
+ ${GEN_DEPENDS}
+ ${GENSCRIPTS} msp430x112 "$(tdir_msp430x112)"
emsp430x1101.c: $(srcdir)/emulparams/msp430x1101.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
@@ -1811,78 +1826,74 @@ emsp430x1132.c: $(srcdir)/emulparams/msp430x1132.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
${GENSCRIPTS} msp430x1132 "$(tdir_msp430x1132)"
-emsp430x1331.c: $(srcdir)/emulparams/msp430x1331.sh \
- $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
- ${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x1331 "$(tdir_msp430x1331)"
-emsp430x1351.c: $(srcdir)/emulparams/msp430x1351.sh \
+emsp430x122.c: $(srcdir)/emulparams/msp430x122.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x1351 "$(tdir_msp430x1351)"
-emsp430x149.c: $(srcdir)/emulparams/msp430x149.sh \
+ ${GENSCRIPTS} msp430x122 "$(tdir_msp430x122)"
+emsp430x123.c: $(srcdir)/emulparams/msp430x123.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x149 "$(tdir_msp430x149)"
-emsp430x148.c: $(srcdir)/emulparams/msp430x148.sh \
+ ${GENSCRIPTS} msp430x123 "$(tdir_msp430x123)"
+emsp430x1222.c: $(srcdir)/emulparams/msp430x1222.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x148 "$(tdir_msp430x148)"
-emsp430x449.c: $(srcdir)/emulparams/msp430x449.sh \
+ ${GENSCRIPTS} msp430x1222 "$(tdir_msp430x1222)"
+emsp430x1232.c: $(srcdir)/emulparams/msp430x1232.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x449 "$(tdir_msp430x449)"
-emsp430x448.c: $(srcdir)/emulparams/msp430x448.sh \
+ ${GENSCRIPTS} msp430x1232 "$(tdir_msp430x1232)"
+emsp430x133.c: $(srcdir)/emulparams/msp430x133.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x448 "$(tdir_msp430x448)"
-emsp430x447.c: $(srcdir)/emulparams/msp430x447.sh \
+ ${GENSCRIPTS} msp430x133 "$(tdir_msp430x133)"
+emsp430x135.c: $(srcdir)/emulparams/msp430x135.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x447 "$(tdir_msp430x447)"
-emsp430x412.c: $(srcdir)/emulparams/msp430x412.sh \
+ ${GENSCRIPTS} msp430x135 "$(tdir_msp430x135)"
+emsp430x1331.c: $(srcdir)/emulparams/msp430x1331.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x412 "$(tdir_msp430x412)"
-emsp430x413.c: $(srcdir)/emulparams/msp430x413.sh \
+ ${GENSCRIPTS} msp430x1331 "$(tdir_msp430x1331)"
+emsp430x1351.c: $(srcdir)/emulparams/msp430x1351.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x413 "$(tdir_msp430x413)"
+ ${GENSCRIPTS} msp430x1351 "$(tdir_msp430x1351)"
emsp430x147.c: $(srcdir)/emulparams/msp430x147.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
${GENSCRIPTS} msp430x147 "$(tdir_msp430x147)"
-emsp430x135.c: $(srcdir)/emulparams/msp430x135.sh \
+emsp430x148.c: $(srcdir)/emulparams/msp430x148.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x135 "$(tdir_msp430x135)"
-emsp430x133.c: $(srcdir)/emulparams/msp430x133.sh \
+ ${GENSCRIPTS} msp430x148 "$(tdir_msp430x148)"
+emsp430x149.c: $(srcdir)/emulparams/msp430x149.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x133 "$(tdir_msp430x133)"
-emsp430x110.c: $(srcdir)/emulparams/msp430x110.sh \
+ ${GENSCRIPTS} msp430x149 "$(tdir_msp430x149)"
+emsp430x155.c: $(srcdir)/emulparams/msp430x155.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x110 "$(tdir_msp430x110)"
-emsp430x112.c: $(srcdir)/emulparams/msp430x112.sh \
+ ${GENSCRIPTS} msp430x155 "$(tdir_msp430x155)"
+emsp430x156.c: $(srcdir)/emulparams/msp430x156.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x112 "$(tdir_msp430x112)"
-emsp430x122.c: $(srcdir)/emulparams/msp430x122.sh \
+ ${GENSCRIPTS} msp430x156 "$(tdir_msp430x156)"
+emsp430x157.c: $(srcdir)/emulparams/msp430x157.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x122 "$(tdir_msp430x122)"
-emsp430x1222.c: $(srcdir)/emulparams/msp430x1222.sh \
+ ${GENSCRIPTS} msp430x157 "$(tdir_msp430x157)"
+emsp430x167.c: $(srcdir)/emulparams/msp430x167.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x1222 "$(tdir_msp430x1222)"
-emsp430x123.c: $(srcdir)/emulparams/msp430x123.sh \
+ ${GENSCRIPTS} msp430x167 "$(tdir_msp430x167)"
+emsp430x168.c: $(srcdir)/emulparams/msp430x167.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x123 "$(tdir_msp430x123)"
-emsp430x1232.c: $(srcdir)/emulparams/msp430x1232.sh \
+ ${GENSCRIPTS} msp430x168 "$(tdir_msp430x168)"
+emsp430x169.c: $(srcdir)/emulparams/msp430x169.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x1232 "$(tdir_msp430x1232)"
+ ${GENSCRIPTS} msp430x169 "$(tdir_msp430x169)"
emsp430x311.c: $(srcdir)/emulparams/msp430x311.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430_3.sc \
${GEN_DEPENDS}
@@ -1919,42 +1930,62 @@ emsp430x337.c: $(srcdir)/emulparams/msp430x337.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430_3.sc \
${GEN_DEPENDS}
${GENSCRIPTS} msp430x337 "$(tdir_msp430x337)"
-emsp430x435.c: $(srcdir)/emulparams/msp430x435.sh \
+emsp430x412.c: $(srcdir)/emulparams/msp430x412.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x435 "$(tdir_msp430x435)"
-emsp430x436.c: $(srcdir)/emulparams/msp430x436.sh \
+ ${GENSCRIPTS} msp430x412 "$(tdir_msp430x412)"
+emsp430x413.c: $(srcdir)/emulparams/msp430x413.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x436 "$(tdir_msp430x436)"
-emsp430x437.c: $(srcdir)/emulparams/msp430x437.sh \
+ ${GENSCRIPTS} msp430x413 "$(tdir_msp430x413)"
+emsp430xE423.c: $(srcdir)/emulparams/msp430xE423.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x437 "$(tdir_msp430x437)"
-emsp430x167.c: $(srcdir)/emulparams/msp430x167.sh \
+ ${GENSCRIPTS} msp430xE423 "$(tdir_msp430xE423)"
+emsp430xE425.c: $(srcdir)/emulparams/msp430xE425.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x167 "$(tdir_msp430x167)"
-emsp430x168.c: $(srcdir)/emulparams/msp430x167.sh \
+ ${GENSCRIPTS} msp430xE425 "$(tdir_msp430xE425)"
+emsp430xE427.c: $(srcdir)/emulparams/msp430xE427.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x168 "$(tdir_msp430x168)"
-emsp430x169.c: $(srcdir)/emulparams/msp430x169.sh \
+ ${GENSCRIPTS} msp430xE427 "$(tdir_msp430xE427)"
+emsp430xW423.c: $(srcdir)/emulparams/msp430xW423.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x169 "$(tdir_msp430x169)"
-emsp430x155.c: $(srcdir)/emulparams/msp430x155.sh \
+ ${GENSCRIPTS} msp430xW423 "$(tdir_msp430xW423)"
+emsp430xW425.c: $(srcdir)/emulparams/msp430xW425.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x155 "$(tdir_msp430x155)"
-emsp430x156.c: $(srcdir)/emulparams/msp430x156.sh \
+ ${GENSCRIPTS} msp430xW425 "$(tdir_msp430xW425)"
+emsp430xW427.c: $(srcdir)/emulparams/msp430xW427.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x156 "$(tdir_msp430x156)"
-emsp430x157.c: $(srcdir)/emulparams/msp430x157.sh \
+ ${GENSCRIPTS} msp430xW427 "$(tdir_msp430xW427)"
+emsp430x435.c: $(srcdir)/emulparams/msp430x435.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
${GEN_DEPENDS}
- ${GENSCRIPTS} msp430x157 "$(tdir_msp430x157)"
+ ${GENSCRIPTS} msp430x435 "$(tdir_msp430x435)"
+emsp430x436.c: $(srcdir)/emulparams/msp430x436.sh \
+ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
+ ${GEN_DEPENDS}
+ ${GENSCRIPTS} msp430x436 "$(tdir_msp430x436)"
+emsp430x437.c: $(srcdir)/emulparams/msp430x437.sh \
+ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
+ ${GEN_DEPENDS}
+ ${GENSCRIPTS} msp430x437 "$(tdir_msp430x437)"
+emsp430x447.c: $(srcdir)/emulparams/msp430x447.sh \
+ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
+ ${GEN_DEPENDS}
+ ${GENSCRIPTS} msp430x447 "$(tdir_msp430x447)"
+emsp430x448.c: $(srcdir)/emulparams/msp430x448.sh \
+ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
+ ${GEN_DEPENDS}
+ ${GENSCRIPTS} msp430x448 "$(tdir_msp430x448)"
+emsp430x449.c: $(srcdir)/emulparams/msp430x449.sh \
+ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32msp430.sc \
+ ${GEN_DEPENDS}
+ ${GENSCRIPTS} msp430x449 "$(tdir_msp430x449)"
enews.c: $(srcdir)/emulparams/news.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
${GENSCRIPTS} news "$(tdir_news)"
diff --git a/ld/configure.tgt b/ld/configure.tgt
index c6756d08b98..16c64ecaf40 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -435,8 +435,8 @@ mmix-*-*) targ_emul=mmo
;;
mn10200-*-*) targ_emul=mn10200 ;;
mn10300-*-*) targ_emul=mn10300 ;;
-msp430-*-*) targ_emul=msp430x149
- targ_extra_emuls="msp430x148 msp430x147 msp430x133 msp430x135 msp430x110 msp430x112 msp430x122 msp430x123 msp430x412 msp430x413 msp430x311 msp430x312 msp430x313 msp430x314 msp430x315 msp430x323 msp430x325 msp430x336 msp430x337 msp430x1101 msp430x1111 msp430x1121 msp430x1331 msp430x1351 msp430x435 msp430x436 msp430x437 msp430x447 msp430x448 msp430x449 msp430x1222 msp430x1232 msp430x169 msp430x168 msp430x167 msp430x155 msp430x156 msp430x157 msp430x1122 msp430x1132" ;;
+msp430-*-*) targ_emul=msp430x110
+ targ_extra_emuls="msp430x112 msp430x1101 msp430x1111 msp430x1121 msp430x1122 msp430x1132 msp430x122 msp430x123 msp430x1222 msp430x1232 msp430x133 msp430x135 msp430x1331 msp430x1351 msp430x147 msp430x148 msp430x149 msp430x155 msp430x156 msp430x157 msp430x167 msp430x168 msp430x169 msp430x311 msp430x312 msp430x313 msp430x314 msp430x315 msp430x323 msp430x325 msp430x336 msp430x337 msp430x412 msp430x413 msp430xE423 msp430xE425 msp430xE427 msp430xW423 msp430xW425 msp430xW427 msp430x435 msp430x436 msp430x437 msp430x447 msp430x448 msp430x449" ;;
alpha*-*-freebsd*) targ_emul=elf64alpha_fbsd
targ_extra_emuls="elf64alpha alpha"
tdir_alpha=`echo ${targ_alias} | sed -e 's/freebsd/freebsdecoff/'`
diff --git a/ld/emulparams/msp430xE423.sh b/ld/emulparams/msp430xE423.sh
new file mode 100644
index 00000000000..53d19cd7177
--- /dev/null
+++ b/ld/emulparams/msp430xE423.sh
@@ -0,0 +1,14 @@
+ARCH=msp:42
+MACHINE=
+SCRIPT_NAME=elf32msp430
+OUTPUT_FORMAT="elf32-msp430"
+MAXPAGESIZE=1
+EMBEDDED=yes
+TEMPLATE_NAME=generic
+
+ROM_START=0xe000
+ROM_SIZE=0x1fe0
+RAM_START=0x0200
+RAM_SIZE=256
+
+STACK=0x300
diff --git a/ld/emulparams/msp430xE425.sh b/ld/emulparams/msp430xE425.sh
new file mode 100644
index 00000000000..1659936ed00
--- /dev/null
+++ b/ld/emulparams/msp430xE425.sh
@@ -0,0 +1,14 @@
+ARCH=msp:42
+MACHINE=
+SCRIPT_NAME=elf32msp430
+OUTPUT_FORMAT="elf32-msp430"
+MAXPAGESIZE=1
+EMBEDDED=yes
+TEMPLATE_NAME=generic
+
+ROM_START=0xc000
+ROM_SIZE=0x3fe0
+RAM_START=0x0200
+RAM_SIZE=512
+
+STACK=0x400
diff --git a/ld/emulparams/msp430xE427.sh b/ld/emulparams/msp430xE427.sh
new file mode 100644
index 00000000000..ccf69cd720e
--- /dev/null
+++ b/ld/emulparams/msp430xE427.sh
@@ -0,0 +1,14 @@
+ARCH=msp:42
+MACHINE=
+SCRIPT_NAME=elf32msp430
+OUTPUT_FORMAT="elf32-msp430"
+MAXPAGESIZE=1
+EMBEDDED=yes
+TEMPLATE_NAME=generic
+
+ROM_START=0x8000
+ROM_SIZE=0x7fe0
+RAM_START=0x0200
+RAM_SIZE=1K
+
+STACK=0x600
diff --git a/ld/emulparams/msp430xW423.sh b/ld/emulparams/msp430xW423.sh
new file mode 100644
index 00000000000..53d19cd7177
--- /dev/null
+++ b/ld/emulparams/msp430xW423.sh
@@ -0,0 +1,14 @@
+ARCH=msp:42
+MACHINE=
+SCRIPT_NAME=elf32msp430
+OUTPUT_FORMAT="elf32-msp430"
+MAXPAGESIZE=1
+EMBEDDED=yes
+TEMPLATE_NAME=generic
+
+ROM_START=0xe000
+ROM_SIZE=0x1fe0
+RAM_START=0x0200
+RAM_SIZE=256
+
+STACK=0x300
diff --git a/ld/emulparams/msp430xW425.sh b/ld/emulparams/msp430xW425.sh
new file mode 100644
index 00000000000..1659936ed00
--- /dev/null
+++ b/ld/emulparams/msp430xW425.sh
@@ -0,0 +1,14 @@
+ARCH=msp:42
+MACHINE=
+SCRIPT_NAME=elf32msp430
+OUTPUT_FORMAT="elf32-msp430"
+MAXPAGESIZE=1
+EMBEDDED=yes
+TEMPLATE_NAME=generic
+
+ROM_START=0xc000
+ROM_SIZE=0x3fe0
+RAM_START=0x0200
+RAM_SIZE=512
+
+STACK=0x400
diff --git a/ld/emulparams/msp430xW427.sh b/ld/emulparams/msp430xW427.sh
new file mode 100644
index 00000000000..ccf69cd720e
--- /dev/null
+++ b/ld/emulparams/msp430xW427.sh
@@ -0,0 +1,14 @@
+ARCH=msp:42
+MACHINE=
+SCRIPT_NAME=elf32msp430
+OUTPUT_FORMAT="elf32-msp430"
+MAXPAGESIZE=1
+EMBEDDED=yes
+TEMPLATE_NAME=generic
+
+ROM_START=0x8000
+ROM_SIZE=0x7fe0
+RAM_START=0x0200
+RAM_SIZE=1K
+
+STACK=0x600
View Lorry Controller Status