PR binutils/19935: Fix fallout from now-default initfini-array.

	* emulparams/criself.sh (USER_LABEL_PREFIX): Define.
	(OTHER_END_SYMBOLS, ENTRY): Delete now-redundant defines.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 45d6dee772b397e3a6a59a04f9b11fc369e0c513..472b278a484423ddedc8c124a807f13c46caed3f 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2017-02-02  Hans-Peter Nilsson  <hp@axis.com>
+
+       PR binutils/19935
+       Fix long-standing buglet and fallout from now-default initfini-array.
+       * emulparams/criself.sh (USER_LABEL_PREFIX): Define.
+       (OTHER_END_SYMBOLS, ENTRY): Delete now-redundant defines.
+
 2017-02-01  Maciej W. Rozycki  <macro@imgtec.com>
 
        * testsuite/ld-mips-elf/vxworks-forced-local-1.d: Correct the

diff --git a/ld/emulparams/criself.sh b/ld/emulparams/criself.sh
index dcddc0fbbc3e233c11a366d0397501c49d87792d..5ea928425ec5d90c4262e6249a421187573b4cdc 100644 (file)
--- a/ld/emulparams/criself.sh
+++ b/ld/emulparams/criself.sh
@@ -8,7 +8,7 @@ OUTPUT_FORMAT="elf32-us-cris"
 NO_REL_RELOCS=yes
 ARCH=cris
 MAXPAGESIZE=32
-ENTRY=__start
+USER_LABEL_PREFIX=_
 EMBEDDED=yes
 ALIGNMENT=32
 TEXT_START_ADDR=0
@@ -53,7 +53,6 @@ OTHER_BSS_END_SYMBOLS='
  __Sbss = ADDR (.bss);
  PROVIDE (_bss_start = __Sbss);
 '
-OTHER_END_SYMBOLS='PROVIDE (__end = .);'
 
 INIT_ADDR='ALIGN (2)'