diff options
| -rw-r--r-- | ld/ChangeLog | 17 | ||||
| -rw-r--r-- | ld/Makefile.am | 19 | ||||
| -rw-r--r-- | ld/Makefile.in | 19 | ||||
| -rw-r--r-- | ld/emulparams/elf32bfin.sh (renamed from ld/emulparams/bfin.sh) | 0 | ||||
| -rw-r--r-- | ld/emulparams/elf32bfinfd.sh | 2 | ||||
| -rw-r--r-- | ld/emulparams/msp430.sh (renamed from ld/emulparams/msp430all.sh) | 13 | ||||
| -rw-r--r-- | ld/emulparams/msp430X.sh | 8 | ||||
| -rw-r--r-- | ld/emulparams/score3_elf.sh (renamed from ld/emulparams/scoreelf.sh) | 8 | ||||
| -rw-r--r-- | ld/emulparams/score7_elf.sh | 2 | ||||
| -rwxr-xr-x | ld/genscripts.sh | 10 |
10 files changed, 48 insertions, 50 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 6809610..2ebf3aa 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,20 @@ +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} diff --git a/ld/Makefile.am b/ld/Makefile.am index d66801b..24ba3e1 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -942,12 +942,12 @@ eelf32b4300.c: $(srcdir)/emulparams/elf32b4300.sh \ $(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} @@ -1480,13 +1480,11 @@ emn10300.c: $(srcdir)/emulparams/mn10300.sh \ $(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 \ @@ -1586,11 +1584,12 @@ eppcpe.c: $(srcdir)/emulparams/ppcpe.sh \ 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} diff --git a/ld/Makefile.in b/ld/Makefile.in index 42a2cc4..9dd4399 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -2377,12 +2377,12 @@ eelf32b4300.c: $(srcdir)/emulparams/elf32b4300.sh \ $(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} @@ -2915,13 +2915,11 @@ emn10300.c: $(srcdir)/emulparams/mn10300.sh \ $(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 \ @@ -3021,11 +3019,12 @@ eppcpe.c: $(srcdir)/emulparams/ppcpe.sh \ 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} diff --git a/ld/emulparams/bfin.sh b/ld/emulparams/elf32bfin.sh index 6c0bb40..6c0bb40 100644 --- a/ld/emulparams/bfin.sh +++ b/ld/emulparams/elf32bfin.sh diff --git a/ld/emulparams/elf32bfinfd.sh b/ld/emulparams/elf32bfinfd.sh index 26f8f47..4c96bc9 100644 --- a/ld/emulparams/elf32bfinfd.sh +++ b/ld/emulparams/elf32bfinfd.sh @@ -1,4 +1,4 @@ -. ${srcdir}/emulparams/bfin.sh +. ${srcdir}/emulparams/elf32bfin.sh unset STACK_ADDR OUTPUT_FORMAT="elf32-bfinfdpic" MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" diff --git a/ld/emulparams/msp430all.sh b/ld/emulparams/msp430.sh index 1f1eef8..b459698 100644 --- a/ld/emulparams/msp430all.sh +++ b/ld/emulparams/msp430.sh @@ -2,8 +2,6 @@ # This called by genscripts_extra.sh -MSP430_NAME=${EMULATION_NAME} - SCRIPT_NAME=elf32msp430 TEMPLATE_NAME=generic EXTRA_EM_FILE=genelf @@ -12,20 +10,9 @@ MACHINE= 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 diff --git a/ld/emulparams/msp430X.sh b/ld/emulparams/msp430X.sh new file mode 100644 index 0000000..fea669b --- /dev/null +++ b/ld/emulparams/msp430X.sh @@ -0,0 +1,8 @@ +. ${srcdir}/emulparams/msp430.sh + +ARCH=MSP430x43 +ROM_START=0x02000 +ROM_SIZE=0x0dfe0 +RAM_START=0x10000 +RAM_SIZE=0x30000 +STACK=0x600 diff --git a/ld/emulparams/scoreelf.sh b/ld/emulparams/score3_elf.sh index 3a7ed31..4636cd3 100644 --- a/ld/emulparams/scoreelf.sh +++ b/ld/emulparams/score3_elf.sh @@ -26,15 +26,7 @@ OTHER_BSS_SYMBOLS=' # 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 diff --git a/ld/emulparams/score7_elf.sh b/ld/emulparams/score7_elf.sh new file mode 100644 index 0000000..9b7ce9b --- /dev/null +++ b/ld/emulparams/score7_elf.sh @@ -0,0 +1,2 @@ +. ${srcdir}/emulparams/score3_elf.sh +ARCH=score7 diff --git a/ld/genscripts.sh b/ld/genscripts.sh index 4436070..499607a 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh @@ -33,8 +33,7 @@ # enable_initfini_array \ # this_emulation \ # optional: -# tool_dir \ -# customizer_script +# tool_dir # # Sample usage: # @@ -93,14 +92,9 @@ use_sysroot=$1 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 |