From bf382b306a8db84b450aa1dc96ab686fb189a31c Mon Sep 17 00:00:00 2001
From: Hans-Peter Nilsson <hp@bitrange.com>
Date: Sun, 29 Jan 2017 13:53:58 +0100
Subject: [PATCH] Fix long-standing buglet and fallout from now-default
 initfini-array.

	* emulparams/criself.sh (USER_LABEL_PREFIX): Define.
	(OTHER_READONLY_SECTIONS, ENTRY): Delete now-redunant defines.
---
 ld/ChangeLog             | 6 ++++++
 ld/emulparams/criself.sh | 3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 9294c4a035..18f2e2e6aa 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2017-01-29  Hans-Peter Nilsson  <hp@axis.com>
+
+	Fix long-standing buglet and fallout from now-default initfini-array.
+	* emulparams/criself.sh (USER_LABEL_PREFIX): Define.
+	(OTHER_READONLY_SECTIONS, ENTRY): Delete now-redunant defines.
+
 2017-01-27  Jiong Wang  <jiong.wang@arm.com>
 
 	* testsuite/ld-elf/elf.exp ("pr20995-2", "Build pr20995-2.so"): XFAIL on
diff --git a/ld/emulparams/criself.sh b/ld/emulparams/criself.sh
index dcddc0fbbc..5ea928425e 100644
--- 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)'