+2014-06-02 Alan Modra <amodra@gmail.com>
+
+ * emulparams/elf32bfin.sh: Rename from bfin.sh.
+ * emulparams/elf32bfinfd.sh: Update to suit.
+ * emulparams/: Delete.
+ * emulparams/msp430.sh: Rename from msp430all.sh. Remove
+ MSP430_NAME and msp430X vars.
+ * emulparams/msp430X.sh: New.
+ * emulparams/: Delete.
+ * emulparams/score3_elf.sh: Rename from scoreelf.sh. Remove
+ SCORE_NAME and score7_elf ARCH setting.
+ * emulparams/score7_elf.sh: New.
+ * Makefile.am (eelf32bfin.c, eelf32bfinfd.c): Update dependencies.
+ (emsp430.c, emsp430X.c, escore3_elf.c, escore7_elf.c): Likewise.
+ * Makefile.in: Regenerate.
+ * genscripts.sh: Delete customizer_script param.
+
2014-05-28 Hans-Peter Nilsson <hp@axis.com>
* Makefile.am: Change all rules with ${GENSCRIPTS}
$(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) \
$(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-eelf32bfin.c: $(srcdir)/emulparams/bfin.sh \
+eelf32bfin.c: $(srcdir)/emulparams/elf32bfin.sh \
$(ELF_DEPS) $(srcdir)/emultempl/bfin.em \
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
eelf32bfinfd.c: $(srcdir)/emulparams/elf32bfinfd.sh \
- $(srcdir)/emulparams/bfin.sh \
+ $(srcdir)/emulparams/elf32bfin.sh \
$(ELF_DEPS) $(srcdir)/emultempl/bfin.em \
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
$(srcdir)/emulparams/mn10200.sh \
$(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-emsp430.c: $(srcdir)/emulparams/msp430all.sh \
- $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
- ${GEN_DEPENDS}
+emsp430.c: $(srcdir)/emulparams/msp430.sh \
+ $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc ${GEN_DEPENDS}
-emsp430X.c: $(srcdir)/emulparams/msp430all.sh \
- $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
- ${GEN_DEPENDS}
+emsp430X.c: $(srcdir)/emulparams/msp430.sh $(srcdir)/emulparams/msp430X.sh \
+ $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc ${GEN_DEPENDS}
ends32elf.c: $(srcdir)/emulparams/nds32elf.sh \
$(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
eriscix.c: $(srcdir)/emulparams/riscix.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-escore3_elf.c: $(srcdir)/emulparams/scoreelf.sh \
+escore3_elf.c: $(srcdir)/emulparams/score3_elf.sh \
$(ELF_DEPS) $(srcdir)/emultempl/scoreelf.em \
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-escore7_elf.c: $(srcdir)/emulparams/scoreelf.sh \
+escore7_elf.c: $(srcdir)/emulparams/score3_elf.sh \
+ $(srcdir)/emulparams/score7_elf.sh \
$(ELF_DEPS) $(srcdir)/emultempl/scoreelf.em \
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
$(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) \
$(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-eelf32bfin.c: $(srcdir)/emulparams/bfin.sh \
+eelf32bfin.c: $(srcdir)/emulparams/elf32bfin.sh \
$(ELF_DEPS) $(srcdir)/emultempl/bfin.em \
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
eelf32bfinfd.c: $(srcdir)/emulparams/elf32bfinfd.sh \
- $(srcdir)/emulparams/bfin.sh \
+ $(srcdir)/emulparams/elf32bfin.sh \
$(ELF_DEPS) $(srcdir)/emultempl/bfin.em \
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
$(srcdir)/emulparams/mn10200.sh \
$(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-emsp430.c: $(srcdir)/emulparams/msp430all.sh \
- $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
- ${GEN_DEPENDS}
+emsp430.c: $(srcdir)/emulparams/msp430.sh \
+ $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc ${GEN_DEPENDS}
-emsp430X.c: $(srcdir)/emulparams/msp430all.sh \
- $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc \
- ${GEN_DEPENDS}
+emsp430X.c: $(srcdir)/emulparams/msp430.sh $(srcdir)/emulparams/msp430X.sh \
+ $(ELF_GEN_DEPS) $(srcdir)/scripttempl/elf32msp430.sc ${GEN_DEPENDS}
ends32elf.c: $(srcdir)/emulparams/nds32elf.sh \
$(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
eriscix.c: $(srcdir)/emulparams/riscix.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
-escore3_elf.c: $(srcdir)/emulparams/scoreelf.sh \
+escore3_elf.c: $(srcdir)/emulparams/score3_elf.sh \
$(ELF_DEPS) $(srcdir)/emultempl/scoreelf.em \
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-escore7_elf.c: $(srcdir)/emulparams/scoreelf.sh \
+escore7_elf.c: $(srcdir)/emulparams/score3_elf.sh \
+ $(srcdir)/emulparams/score7_elf.sh \
$(ELF_DEPS) $(srcdir)/emultempl/scoreelf.em \
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-. ${srcdir}/emulparams/bfin.sh
+. ${srcdir}/emulparams/elf32bfin.sh
unset STACK_ADDR
OUTPUT_FORMAT="elf32-bfinfdpic"
MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
# This called by genscripts_extra.sh
-MSP430_NAME=${EMULATION_NAME}
-
SCRIPT_NAME=elf32msp430
TEMPLATE_NAME=generic
EXTRA_EM_FILE=genelf
MAXPAGESIZE=1
EMBEDDED=yes
-if [ "${MSP430_NAME}" = "msp430" ] ; then
ARCH=msp:14
ROM_START=0x8000
ROM_SIZE=0x7fe0
RAM_START=0x0200
RAM_SIZE=1K
STACK=0x600
-fi
-
-if [ "${MSP430_NAME}" = "msp430X" ] ; then
-ARCH=MSP430x43
-ROM_START=0x02000
-ROM_SIZE=0x0dfe0
-RAM_START=0x10000
-RAM_SIZE=0x30000
-STACK=0x600
-fi
--- /dev/null
+. ${srcdir}/emulparams/msp430.sh
+
+ARCH=MSP430x43
+ROM_START=0x02000
+ROM_SIZE=0x0dfe0
+RAM_START=0x10000
+RAM_SIZE=0x30000
+STACK=0x600
# This sets the stack to the top of the simulator memory (2^19 bytes).
STACK_ADDR=0x8000000
-SCORE_NAME=${EMULATION_NAME}
-if [ "${SCORE_NAME}" = "score3_elf" ] ; then
ARCH=score3
-fi
-
-if [ "${SCORE_NAME}" = "score7_elf" ] ; then
-ARCH=score7
-fi
-
MACHINE=
ENTRY=_start
EMBEDDED=yes
--- /dev/null
+. ${srcdir}/emulparams/score3_elf.sh
+ARCH=score7
# enable_initfini_array \
# this_emulation \
# optional:
-# tool_dir \
-# customizer_script
+# tool_dir
#
# Sample usage:
#
ENABLE_INITFINI_ARRAY=$2
EMULATION_NAME=$3
TOOL_LIB=$4
-CUSTOMIZER_SCRIPT=$5
-
-if [ "x${CUSTOMIZER_SCRIPT}" = "x" ] ; then
- CUSTOMIZER_SCRIPT=${EMULATION_NAME}
-fi
-CUSTOMIZER_SCRIPT="${srcdir}/emulparams/${CUSTOMIZER_SCRIPT}.sh"
# Include the emulation-specific parameters:
+CUSTOMIZER_SCRIPT="${srcdir}/emulparams/${EMULATION_NAME}.sh"
. ${CUSTOMIZER_SCRIPT}
if test -d ldscripts; then