Revert "GENERATE_SHLIB_SCRIPT vs. EMBEDDED."

This reverts commit f2aaebdb97977ee7a5c83c02af871e758e7d594b.
My reasons for making that change were just plain wrong.

15 files changed, 35 insertions, 9 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index ea262034e06..ad7cfd5eada 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,20 @@
+2019-11-08  Alan Modra  <amodra@gmail.com>
+
+	* emulparams/aarch64elf.sh: Revert 2019-11-05 change.
+	* emulparams/aarch64elf32.sh: Likewise.
+	* emulparams/arcelf.sh: Likewise.
+	* emulparams/armelf.sh: Likewise.
+	* emulparams/armelf_fbsd.sh: Likewise.
+	* emulparams/armelf_nbsd.sh: Likewise.
+	* emulparams/armelf_vxworks.sh: Likewise.
+	* emulparams/armsymbian.sh: Likewise.
+	* emulparams/elf32bfin.sh: Likewise.
+	* emulparams/elf32microblaze.sh: Likewise.
+	* emulparams/score3_elf.sh: Likewise.
+	* emulparams/shelf.sh: Likewise.
+	* emulparams/shelf_nbsd.sh: Likewise.
+	* emulparams/shelf_uclinux.sh: Likewise.
+
 2019-11-07  Alan Modra  <amodra@gmail.com>
 
 	* emulparams/elf32cr16c.sh: Delete.
diff --git a/ld/emulparams/aarch64elf.sh b/ld/emulparams/aarch64elf.sh
index 5c70b556864..8f68e517b45 100644
--- a/ld/emulparams/aarch64elf.sh
+++ b/ld/emulparams/aarch64elf.sh
@@ -12,6 +12,9 @@ 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 a94025a139b..5a08d9e29f1 100644
--- a/ld/emulparams/aarch64elf32.sh
+++ b/ld/emulparams/aarch64elf32.sh
@@ -12,6 +12,9 @@ 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 b6d8f9fdf76..625ec397790 100644
--- a/ld/emulparams/arcelf.sh
+++ b/ld/emulparams/arcelf.sh
@@ -19,3 +19,5 @@ 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 8977fd6fea8..0e3147c1f24 100644
--- a/ld/emulparams/armelf.sh
+++ b/ld/emulparams/armelf.sh
@@ -32,6 +32,9 @@ 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 4428b91a34f..be88c2f2e0e 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 45954597ee5..37e1a4afdd0 100644
--- a/ld/emulparams/armelf_nbsd.sh
+++ b/ld/emulparams/armelf_nbsd.sh
@@ -3,7 +3,5 @@ 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 e344209905e..5f57535feed 100644
--- a/ld/emulparams/armelf_vxworks.sh
+++ b/ld/emulparams/armelf_vxworks.sh
@@ -4,4 +4,3 @@ 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 183750a5647..1959685f9b4 100644
--- a/ld/emulparams/armsymbian.sh
+++ b/ld/emulparams/armsymbian.sh
@@ -8,8 +8,6 @@ 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 6e08035b6f3..8d298b467c9 100644
--- a/ld/emulparams/elf32bfin.sh
+++ b/ld/emulparams/elf32bfin.sh
@@ -6,6 +6,7 @@ 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 698adb7cf83..f867018eb38 100644
--- a/ld/emulparams/elf32microblaze.sh
+++ b/ld/emulparams/elf32microblaze.sh
@@ -21,3 +21,6 @@ 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 78401876e5f..7be7883363e 100644
--- a/ld/emulparams/score3_elf.sh
+++ b/ld/emulparams/score3_elf.sh
@@ -26,3 +26,4 @@ ARCH=score3
 MACHINE=
 ENTRY=_start
 EMBEDDED=yes
+GENERATE_SHLIB_SCRIPT=yes
diff --git a/ld/emulparams/shelf.sh b/ld/emulparams/shelf.sh
index 96c18c07502..63c2ff19dc9 100644
--- a/ld/emulparams/shelf.sh
+++ b/ld/emulparams/shelf.sh
@@ -9,6 +9,7 @@ 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 57db803d002..391399660d8 100644
--- a/ld/emulparams/shelf_nbsd.sh
+++ b/ld/emulparams/shelf_nbsd.sh
@@ -11,7 +11,5 @@ 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 41044f028ce..a22c35a9a8a 100644
--- a/ld/emulparams/shelf_uclinux.sh
+++ b/ld/emulparams/shelf_uclinux.sh
@@ -2,4 +2,3 @@ source_sh ${srcdir}/emulparams/shelf.sh
 
 # We do not want a .stack section
 unset STACK_ADDR
-GENERATE_SHLIB_SCRIPT=yes