[ARC] don't force _init/_fini as DT_INIT/DT_FINI.

Message ID 20190325103951.7863-1-claziss@gmail.com
State New
Headers show
Series
  • [ARC] don't force _init/_fini as DT_INIT/DT_FINI.
Related show

Commit Message

Claudiu Zissulescu March 25, 2019, 10:39 a.m.
Mainline backport:

Recent gcc commit b4371b277f1e ("[ARC] Enable init_array support")
inhibits DT_"INIT,FINI} in favor of DT_{INIT,FINI}ARRAY.

Even prior to that, it seems ARC port is the only one with this
special DT_INIT/FINI handling in linker emulation. Removing it
doesn't seem to change any uClibc/glibc testsuite results,
so this can RIP anyways.

bfd/
    2019-02-01  Vineet Gupta <vgupta@synopsys.com>

           * elf32-arc.c: Delete init_str, fini_str

ld/
    2019-02-01  Vineet Gupta <vgupta@synopsys.com>

           * emultempl/arclinux.em : Delete special INIT/FINI handling.
---
 bfd/ChangeLog            |  9 +++++++++
 bfd/elf32-arc.c          | 10 ----------
 ld/ChangeLog             |  4 ++++
 ld/emultempl/arclinux.em | 29 +----------------------------
 4 files changed, 14 insertions(+), 38 deletions(-)

-- 
2.20.1

Patch

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 6f39735d7b..6433e46e42 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,12 @@ 
+2019-03-25  Claudiu Zissulescu  <claziss@synopsys.com>
+
+	Backport from mainline
+	2019-02-09  Vineet Gupta  <vgupta@synopsys.com>
+	* elf32-arc (INIT_SYM_STRING): Delete.
+	(FINI_SYM_STRING): Likewise.
+	(init_str): Likewise.
+	(fini_str): Likewise.
+
 2019-03-18  Alan Modra  <amodra@gmail.com>
 
 	PR 24355
diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c
index c7469ded8a..b86dd59a3b 100644
--- a/bfd/elf32-arc.c
+++ b/bfd/elf32-arc.c
@@ -71,16 +71,6 @@  name_for_global_symbol (struct elf_link_hash_entry *h)
       }									\
   }
 
-
-/* The default symbols representing the init and fini dyn values.
-   TODO: Check what is the relation of those strings with arclinux.em
-   and DT_INIT.  */
-#define INIT_SYM_STRING "_init"
-#define FINI_SYM_STRING "_fini"
-
-char * init_str = INIT_SYM_STRING;
-char * fini_str = FINI_SYM_STRING;
-
 #define ARC_RELOC_HOWTO(TYPE, VALUE, SIZE, BITSIZE, RELOC_FUNCTION, OVERFLOW, FORMULA) \
       case VALUE: \
 	return "R_" #TYPE; \
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 0f2af45c11..d719425ee6 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@ 
+2019-02-09  Vineet Gupta  <vgupta@synopsys.com>
+
+	* emultempl/arclinux.em: Delete special INIT/FINI handling.
+
 2019-03-01  Andreas Krebbel  <krebbel@linux.ibm.com>
 
 	Backport from mainline
diff --git a/ld/emultempl/arclinux.em b/ld/emultempl/arclinux.em
index 3163712fbd..48b6a616db 100644
--- a/ld/emultempl/arclinux.em
+++ b/ld/emultempl/arclinux.em
@@ -1,7 +1,7 @@ 
 # This shell script emits a C file. -*- C -*-
 # Copyright (C) 2007-2019 Free Software Foundation, Inc.
 #
-# Copyright 2008-2012 Synopsys Inc.
+# Copyright 2008-2019 Synopsys Inc.
 #
 # This file is part of GLD, the Gnu Linker.
 #
@@ -23,30 +23,3 @@ 
 # This file is sourced from elf32.em, and defines extra arc-linux
 # specific routines.
 #
-cat >>e${EMULATION_NAME}.c <<EOF
-extern char * init_str;
-extern char * fini_str;
-EOF
-
-PARSE_AND_LIST_PROLOGUE='
-#define OPTION_INIT 300+1
-#define OPTION_FINI (OPTION_INIT+1)
-'
-PARSE_AND_LIST_LONGOPTS='
-  /* PE options */
-  { "init", required_argument, NULL, OPTION_INIT },
-  { "fini", required_argument, NULL, OPTION_FINI },
-'
-
-# FIXME: Should set PARSE_AND_LIST_OPTIONS to provide a short description
-# of the options.
-
-PARSE_AND_LIST_ARGS_CASES='
-    case OPTION_FINI:
-      fini_str = optarg;
-      break;
-
-    case OPTION_INIT:
-      init_str = optarg;
-      break;
-'