OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow ld target customiser script to force on disk scripts. 

Mucking with EMULATION_LIBPATH has unwanted side effects.  Allow nds32
emulparams scripts to disable compiled-in scripts naturally, by
setting COMPILE_IN=no.

	* genscripts.sh (COMPILE_IN): Don't set if already set.
	* emulparams/nds32elf.sh: Don't clear EMULATION_LIBPATH, set
	COMPILE_IN=no.
	* emulparams/nds32elf16m.sh: Likewise.
	* emulparams/nds32elf_linux.sh: Likewise.
	* emultempl/aix.em: Test COMPILE_IN value is "yes".
	* emultempl/armcoff.em: Likewise.
	* emultempl/elf32.em: Likewise.
	* emultempl/generic.em: Likewise.
	* emultempl/gld960.em: Likewise.
	* emultempl/gld960c.em: Likewise.
	* emultempl/linux.em: Likewise.
	* emultempl/lnk960.em: Likewise.
	* emultempl/m68kcoff.em: Likewise.
	* emultempl/sunos.em: Likewise.
	* emultempl/ticoff.em: Likewise.
This commit is contained in:
Alan Modra 2014-01-17 10:39:50 +10:30
parent 40ed484e74
commit 7225345dbb
16 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ld/ChangeLog
View File

@ -1,3 +1,22 @@
2014-01-17 Alan Modra <amodra@gmail.com>
* genscripts.sh (COMPILE_IN): Don't set if already set.
* emulparams/nds32elf.sh: Don't clear EMULATION_LIBPATH, set
COMPILE_IN=no.
* emulparams/nds32elf16m.sh: Likewise.
* emulparams/nds32elf_linux.sh: Likewise.
* emultempl/aix.em: Test COMPILE_IN value is "yes".
* emultempl/armcoff.em: Likewise.
* emultempl/elf32.em: Likewise.
* emultempl/generic.em: Likewise.
* emultempl/gld960.em: Likewise.
* emultempl/gld960c.em: Likewise.
* emultempl/linux.em: Likewise.
* emultempl/lnk960.em: Likewise.
* emultempl/m68kcoff.em: Likewise.
* emultempl/sunos.em: Likewise.
* emultempl/ticoff.em: Likewise.
2014-01-16 H.J. Lu <hongjiu.lu@intel.com>
PR ld/16456

5
ld/emulparams/nds32elf.sh
View File

@ -14,6 +14,5 @@ MAXPAGESIZE=0x20
EMBEDDED=yes
COMMONPAGESIZE=0x20
# Instruct genscripts.sh not to compile scripts in by COMPILE_IN
# in order to use external linker scripts files.
EMULATION_LIBPATH=
# Use external linker script files.
COMPILE_IN=no

5
ld/emulparams/nds32elf16m.sh
View File

@ -14,6 +14,5 @@ MAXPAGESIZE=0x20
EMBEDDED=yes
COMMONPAGESIZE=0x20
# Instruct genscripts.sh not to compile scripts in by COMPILE_IN
# in order to use external linker scripts files.
EMULATION_LIBPATH=
# Use external linker script files.
COMPILE_IN=no

5
ld/emulparams/nds32elf_linux.sh
View File

@ -31,6 +31,5 @@ fi
GENERATE_SHLIB_SCRIPT=yes
GENERATE_PIE_SCRIPT=yes
# Instruct genscripts.sh not to compile scripts in by COMPILE_IN
# in order to use external linker scripts files.
EMULATION_LIBPATH=
# Use external linker script files.
COMPILE_IN=no

2
ld/emultempl/aix.em
View File

@ -1399,7 +1399,7 @@ static char *
gld${EMULATION_NAME}_get_script (int *isfile)
EOF
if test -n "$COMPILE_IN"
if test x"$COMPILE_IN" = xyes
then
# Scripts compiled in.

2
ld/emultempl/armcoff.em
View File

@ -205,7 +205,7 @@ static char *
gld${EMULATION_NAME}_get_script (int *isfile)
EOF
if test -n "$COMPILE_IN"
if test x"$COMPILE_IN" = xyes
then
# Scripts compiled in.

2
ld/emultempl/elf32.em
View File

@ -2017,7 +2017,7 @@ static char *
gld${EMULATION_NAME}_get_script (int *isfile)
EOF
if test -n "$COMPILE_IN"
if test x"$COMPILE_IN" = xyes
then
# Scripts compiled in.

2
ld/emultempl/generic.em
View File

@ -81,7 +81,7 @@ static char *
gld${EMULATION_NAME}_get_script (int *isfile)
EOF
if test -n "$COMPILE_IN"
if test x"$COMPILE_IN" = xyes
then
# Scripts compiled in.

2
ld/emultempl/gld960.em
View File

@ -74,7 +74,7 @@ static char *
gld960_get_script (int *isfile)
EOF
if test -n "$COMPILE_IN"
if test x"$COMPILE_IN" = xyes
then
# Scripts compiled in.

2
ld/emultempl/gld960c.em
View File

@ -87,7 +87,7 @@ static char *
gld960_get_script (int *isfile)
EOF
if test -n "$COMPILE_IN"
if test x"$COMPILE_IN" = xyes
then
# Scripts compiled in.

2
ld/emultempl/linux.em
View File

@ -131,7 +131,7 @@ static char *
gld${EMULATION_NAME}_get_script (int *isfile)
EOF
if test -n "$COMPILE_IN"
if test x"$COMPILE_IN" = xyes
then
# Scripts compiled in.

2
ld/emultempl/lnk960.em
View File

@ -268,7 +268,7 @@ static char *
lnk960_get_script (int *isfile)
EOF
if test -n "$COMPILE_IN"
if test x"$COMPILE_IN" = xyes
then
# Scripts compiled in.

2
ld/emultempl/m68kcoff.em
View File

@ -165,7 +165,7 @@ static char *
gld${EMULATION_NAME}_get_script (int *isfile)
EOF
if test -n "$COMPILE_IN"
if test x"$COMPILE_IN" = xyes
then
# Scripts compiled in.

2
ld/emultempl/sunos.em
View File

@ -960,7 +960,7 @@ static char *
gld${EMULATION_NAME}_get_script (int *isfile)
EOF
if test -n "$COMPILE_IN"
if test x"$COMPILE_IN" = xyes
then
# Scripts compiled in.

2
ld/emultempl/ticoff.em
View File

@ -106,7 +106,7 @@ gld_${EMULATION_NAME}_before_parse(void)
static char *
gld_${EMULATION_NAME}_get_script (int *isfile)
EOF
if test -n "$COMPILE_IN"
if test x"$COMPILE_IN" = xyes
then
# Scripts compiled in.

4
ld/genscripts.sh
View File

@ -413,8 +413,8 @@ if test -n "$GENERATE_AUTO_IMPORT_SCRIPT"; then
) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xa
fi
case " $EMULATION_LIBPATH " in
*" ${EMULATION_NAME} "*) COMPILE_IN=true;;
case "$COMPILE_IN: $EMULATION_LIBPATH " in
:*" ${EMULATION_NAME} "*) COMPILE_IN=yes;;
esac
# PR ld/5652: