14 files changed, 9 insertions, 18 deletions
diff --git a/ld/emulparams/aarch64elf.sh b/ld/emulparams/aarch64elf.sh
index 8f68e51..5c70b55 100644
--- a/ld/emulparams/aarch64elf.sh
+++ b/ld/emulparams/aarch64elf.sh
@@ -12,9 +12,6 @@ NO_REL_RELOCS=yes
 TEMPLATE_NAME=elf
 EXTRA_EM_FILE=aarch64elf
 
-GENERATE_SHLIB_SCRIPT=yes
-GENERATE_PIE_SCRIPT=yes
-
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 
 ENTRY=_start
diff --git a/ld/emulparams/aarch64elf32.sh b/ld/emulparams/aarch64elf32.sh
index 5a08d9e..a94025a 100644
--- a/ld/emulparams/aarch64elf32.sh
+++ b/ld/emulparams/aarch64elf32.sh
@@ -12,9 +12,6 @@ NO_REL_RELOCS=yes
 TEMPLATE_NAME=elf
 EXTRA_EM_FILE=aarch64elf
 
-GENERATE_SHLIB_SCRIPT=yes
-GENERATE_PIE_SCRIPT=yes
-
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 
 ENTRY=_start
diff --git a/ld/emulparams/arcelf.sh b/ld/emulparams/arcelf.sh
index 625ec39..b6d8f9f 100644
--- a/ld/emulparams/arcelf.sh
+++ b/ld/emulparams/arcelf.sh
@@ -19,5 +19,3 @@ SDATA_START_SYMBOLS='__SDATA_BEGIN__ = . + 0x100;'
 JLI_START_TABLE='__JLI_TABLE__ = .;'
 OTHER_SECTIONS="/DISCARD/ : { *(.__arc_profile_*) }"
 EMBEDDED=yes
-
-GENERATE_SHLIB_SCRIPT=yes
diff --git a/ld/emulparams/armelf.sh b/ld/emulparams/armelf.sh
index 0e3147c..8977fd6 100644
--- a/ld/emulparams/armelf.sh
+++ b/ld/emulparams/armelf.sh
@@ -32,9 +32,6 @@ OTHER_READONLY_SECTIONS="
 
 DATA_START_SYMBOLS="${CREATE_SHLIB+PROVIDE (}__data_start = .${CREATE_SHLIB+)};"
 
-GENERATE_SHLIB_SCRIPT=yes
-GENERATE_PIE_SCRIPT=yes
-
 ARCH=arm
 MACHINE=
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
diff --git a/ld/emulparams/armelf_fbsd.sh b/ld/emulparams/armelf_fbsd.sh
index be88c2f..4428b91 100644
--- a/ld/emulparams/armelf_fbsd.sh
+++ b/ld/emulparams/armelf_fbsd.sh
@@ -5,7 +5,7 @@ TEXT_START_ADDR=0x00010000
 
 TARGET2_TYPE=got-rel
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
+GENERATE_SHLIB_SCRIPT=yes
 GENERATE_PIE_SCRIPT=yes
-
 unset STACK_ADDR
 unset EMBEDDED
diff --git a/ld/emulparams/armelf_nbsd.sh b/ld/emulparams/armelf_nbsd.sh
index 37e1a4a..4595459 100644
--- a/ld/emulparams/armelf_nbsd.sh
+++ b/ld/emulparams/armelf_nbsd.sh
@@ -3,5 +3,7 @@ MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 TEXT_START_ADDR=0x00008000
 TARGET2_TYPE=got-rel
 
+GENERATE_SHLIB_SCRIPT=yes
+GENERATE_PIE_SCRIPT=yes
 unset STACK_ADDR
 unset EMBEDDED
diff --git a/ld/emulparams/armelf_vxworks.sh b/ld/emulparams/armelf_vxworks.sh
index 5f57535..e344209 100644
--- a/ld/emulparams/armelf_vxworks.sh
+++ b/ld/emulparams/armelf_vxworks.sh
@@ -4,3 +4,4 @@ BIG_OUTPUT_FORMAT="elf32-bigarm-vxworks"
 LITTLE_OUTPUT_FORMAT="$OUTPUT_FORMAT"
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 source_sh ${srcdir}/emulparams/vxworks.sh
+GENERATE_SHLIB_SCRIPT=yes
diff --git a/ld/emulparams/armsymbian.sh b/ld/emulparams/armsymbian.sh
index 1959685..183750a 100644
--- a/ld/emulparams/armsymbian.sh
+++ b/ld/emulparams/armsymbian.sh
@@ -8,6 +8,8 @@ TARGET1_IS_REL=1
 TARGET2_TYPE=abs
 # On BPABI systems, program headers should not be mapped.
 EMBEDDED=yes
+# Nonetheless, shared libraries are also supported
+GENERATE_SHLIB_SCRIPT=yes
 
 # As for armelf.sh, but add the SymbianOS-specific
 # .ARM.exidx$${Base,Limit} symbols.
diff --git a/ld/emulparams/elf32bfin.sh b/ld/emulparams/elf32bfin.sh
index 8d298b4..6e08035 100644
--- a/ld/emulparams/elf32bfin.sh
+++ b/ld/emulparams/elf32bfin.sh
@@ -6,7 +6,6 @@ TARGET_PAGE_SIZE=0x1000
 ARCH=bfin
 MACHINE=
 TEMPLATE_NAME=elf
-GENERATE_SHLIB_SCRIPT=yes
 EMBEDDED=yes
 USER_LABEL_PREFIX=_
 EXTRA_EM_FILE=bfin
diff --git a/ld/emulparams/elf32microblaze.sh b/ld/emulparams/elf32microblaze.sh
index f867018..698adb7 100644
--- a/ld/emulparams/elf32microblaze.sh
+++ b/ld/emulparams/elf32microblaze.sh
@@ -21,6 +21,3 @@ NOP=0x80000000
 #OTHER_RELOCATING_SECTIONS='PROVIDE (_stack = _end + 0x1000);'
 
 TEMPLATE_NAME=elf
-#GENERATE_SHLIB_SCRIPT=yes
-
-
diff --git a/ld/emulparams/score3_elf.sh b/ld/emulparams/score3_elf.sh
index 7be7883..7840187 100644
--- a/ld/emulparams/score3_elf.sh
+++ b/ld/emulparams/score3_elf.sh
@@ -26,4 +26,3 @@ ARCH=score3
 MACHINE=
 ENTRY=_start
 EMBEDDED=yes
-GENERATE_SHLIB_SCRIPT=yes
diff --git a/ld/emulparams/shelf.sh b/ld/emulparams/shelf.sh
index 63c2ff1..96c18c0 100644
--- a/ld/emulparams/shelf.sh
+++ b/ld/emulparams/shelf.sh
@@ -9,7 +9,6 @@ MAXPAGESIZE=128
 ARCH=sh
 MACHINE=
 TEMPLATE_NAME=elf
-GENERATE_SHLIB_SCRIPT=yes
 EMBEDDED=yes
 # These are for compatibility with the COFF toolchain.
 ENTRY=start
diff --git a/ld/emulparams/shelf_nbsd.sh b/ld/emulparams/shelf_nbsd.sh
index 3913996..57db803 100644
--- a/ld/emulparams/shelf_nbsd.sh
+++ b/ld/emulparams/shelf_nbsd.sh
@@ -11,5 +11,7 @@ DATA_START_SYMBOLS='PROVIDE (__data_start = .);';
 
 ENTRY=_start
 
+GENERATE_SHLIB_SCRIPT=yes
+GENERATE_PIE_SCRIPT=yes
 unset EMBEDDED
 unset STACK_ADDR
diff --git a/ld/emulparams/shelf_uclinux.sh b/ld/emulparams/shelf_uclinux.sh
index a22c35a..41044f0 100644
--- a/ld/emulparams/shelf_uclinux.sh
+++ b/ld/emulparams/shelf_uclinux.sh
@@ -2,3 +2,4 @@ source_sh ${srcdir}/emulparams/shelf.sh
 
 # We do not want a .stack section
 unset STACK_ADDR
+GENERATE_SHLIB_SCRIPT=yes