Change msp430 emulation to msp430elf

* Makefile.am (msp430): Rename primary emulation to msp430elf.
(emsp430.c): Rename to emsp430elf.c, update dependencies
(emsp430X.c): Update dependencies.
* Makefile.in: Likewise.
* configure.tgt (msp430-*-*): Rename primary emulation to msp430elf.
* emulparame/msp430.sh: Rename to msp430elf.sh.
* emulparams/msp430X.sh: Update.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index f5e25b2136d4b1a2435d01bf1ee23b8fe38db778..ceb90293f4e35701a624a6a0e2ebc7f86af37d9a 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,13 @@
+2015-04-24  DJ Delorie  <dj@redhat.com>
+
+       * Makefile.am (msp430): Rename primary emulation to msp430elf.
+       (emsp430.c): Rename to emsp430elf.c, update dependencies
+       (emsp430X.c): Update dependencies.
+       * Makefile.in: Likewise.
+       * configure.tgt (msp430-*-*): Rename primary emulation to msp430elf.
+       * emulparame/msp430.sh: Rename to msp430elf.sh.
+       * emulparams/msp430X.sh: Update.
+
 2015-04-23  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR binutils/18209

diff --git a/ld/Makefile.am b/ld/Makefile.am
index 99e6fb197df8b352551b89c8f61adde4ee578517..15f89946ac30929ddea786d8123b8858e5ff66d4 100644 (file)
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -351,7 +351,7 @@ ALL_EMULATION_SOURCES = \
        emcorepe.c \
        emn10200.c \
        emn10300.c \
-       emsp430.c \
+       emsp430elf.c \
        emsp430X.c \
        ends32elf.c \
        ends32elf16m.c \
@@ -1528,10 +1528,10 @@ emn10300.c: $(srcdir)/emulparams/mn10300.sh \
   $(srcdir)/emulparams/mn10200.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
-emsp430.c: $(srcdir)/emulparams/msp430.sh \
+emsp430elf.c: $(srcdir)/emulparams/msp430elf.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc ${GEN_DEPENDS}
 
-emsp430X.c: $(srcdir)/emulparams/msp430.sh $(srcdir)/emulparams/msp430X.sh \
+emsp430X.c: $(srcdir)/emulparams/msp430elf.sh $(srcdir)/emulparams/msp430X.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc ${GEN_DEPENDS}
 
 ends32elf.c: $(srcdir)/emulparams/nds32elf.sh \

diff --git a/ld/Makefile.in b/ld/Makefile.in
index bc874f13343f71573df64da1418853116c7c1b51..169fae114ade8f98441c41a4d332034f4fb3baa1 100644 (file)
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -681,7 +681,7 @@ ALL_EMULATION_SOURCES = \
        emcorepe.c \
        emn10200.c \
        emn10300.c \
-       emsp430.c \
+       emsp430elf.c \
        emsp430X.c \
        ends32elf.c \
        ends32elf16m.c \
@@ -1357,7 +1357,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emn10200.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emn10300.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emoxiebox.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emsp430.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emsp430elf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emsp430X.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ends32belf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ends32belf16m.Po@am__quote@
@@ -3026,10 +3026,10 @@ emn10300.c: $(srcdir)/emulparams/mn10300.sh \
   $(srcdir)/emulparams/mn10200.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
-emsp430.c: $(srcdir)/emulparams/msp430.sh \
+emsp430elf.c: $(srcdir)/emulparams/msp430elf.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc ${GEN_DEPENDS}
 
-emsp430X.c: $(srcdir)/emulparams/msp430.sh $(srcdir)/emulparams/msp430X.sh \
+emsp430X.c: $(srcdir)/emulparams/msp430elf.sh $(srcdir)/emulparams/msp430X.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc ${GEN_DEPENDS}
 
 ends32elf.c: $(srcdir)/emulparams/nds32elf.sh \

diff --git a/ld/configure.tgt b/ld/configure.tgt
index 4a45f14e8586586f625fd605ffafbf6ddb5a7d6b..4dd59f6cc3bd51d4b0d24047b41d7f7d7c270707 100644 (file)
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -522,7 +522,7 @@ mn10300-*-*)                targ_emul=mn10300
                        ;;
 mt-*elf)                targ_emul=elf32mt
                        ;;
-msp430-*-*)             targ_emul=msp430
+msp430-*-*)             targ_emul=msp430elf
                        targ_extra_emuls="msp430X"
                        ;;
 nds32*le-*-elf*)       targ_emul=nds32elf

diff --git a/ld/emulparams/msp430.sh b/ld/emulparams/msp430.sh
deleted file mode 100644 (file)
index b459698..0000000
--- a/ld/emulparams/msp430.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# This called by genscripts_extra.sh
-
-SCRIPT_NAME=elf32msp430
-TEMPLATE_NAME=generic
-EXTRA_EM_FILE=genelf
-OUTPUT_FORMAT="elf32-msp430"
-MACHINE=
-MAXPAGESIZE=1
-EMBEDDED=yes
-
-ARCH=msp:14
-ROM_START=0x8000
-ROM_SIZE=0x7fe0
-RAM_START=0x0200
-RAM_SIZE=1K
-STACK=0x600

diff --git a/ld/emulparams/msp430X.sh b/ld/emulparams/msp430X.sh
index fea669bca703accae2b34271e7bc907106ceb382..4f5af486c591de190fa95df11fcd9987d78f5dfd 100644 (file)
--- a/ld/emulparams/msp430X.sh
+++ b/ld/emulparams/msp430X.sh
@@ -1,4 +1,4 @@
-. ${srcdir}/emulparams/msp430.sh
+. ${srcdir}/emulparams/msp430elf.sh
 
 ARCH=MSP430x43
 ROM_START=0x02000

diff --git a/ld/emulparams/msp430elf.sh b/ld/emulparams/msp430elf.sh
new file mode 100644 (file)
index 0000000..b459698
--- /dev/null
+++ b/ld/emulparams/msp430elf.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# This called by genscripts_extra.sh
+
+SCRIPT_NAME=elf32msp430
+TEMPLATE_NAME=generic
+EXTRA_EM_FILE=genelf
+OUTPUT_FORMAT="elf32-msp430"
+MACHINE=
+MAXPAGESIZE=1
+EMBEDDED=yes
+
+ARCH=msp:14
+ROM_START=0x8000
+ROM_SIZE=0x7fe0
+RAM_START=0x0200
+RAM_SIZE=1K
+STACK=0x600