diff options
| author | Alan Modra <amodra@gmail.com> | 2014-06-02 13:54:54 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2014-06-02 14:52:52 +0930 |
| commit | ce46249c155b7eac6cf1c1f0d148ea7bbb340dca (patch) | |
| tree | e7d42afb7176a437036dd92007fde545fb252e87 /ld/emulparams | |
| parent | ad7cf460ea40f0867c3c81ee1c98ba10e20685b4 (diff) | |
| download | gdb-ce46249c155b7eac6cf1c1f0d148ea7bbb340dca.zip gdb-ce46249c155b7eac6cf1c1f0d148ea7bbb340dca.tar.gz gdb-ce46249c155b7eac6cf1c1f0d148ea7bbb340dca.tar.bz2 | |
fix 2014-05-28 ld Makefile.am changes
bfin, msp, and score all used an extra parameter to genscripts.sh
to select a "customizer_script" different from the standard one
named from the emulation. This patch renames the scripts to avoid
the need, tidying them in the process.
* 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.
Diffstat (limited to 'ld/emulparams')
| -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 |
6 files changed, 11 insertions, 22 deletions
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 |