[binutils-gdb] [ARM] PR ld/16572: Remove EF_ARM_HASENTRY flag

[Jiong Wang <jiwang at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=a5721eddd18f4ba11adbc9bef0c6cb49a0cb69b4

commit a5721eddd18f4ba11adbc9bef0c6cb49a0cb69b4
Author: Jiong Wang <jiong.wang@arm.com>
Date:   Tue Mar 10 11:15:13 2015 +0000

    [ARM] PR ld/16572: Remove EF_ARM_HASENTRY flag
    
    bfd/
    2015-03-10  Yuri Gribov  <y.gribov@samsung.arm>
    
    	PR ld/16572
    	* elf32-arm.c (elf32_arm_final_link_relocate): Remove
    	support for ELF_ARM_HASENTRY.
    	(elf32_arm_print_private_bfd_data): Likewise.
    
    binutils/
    2015-03-10  Yuri Gribov  <y.gribov@samsung.arm>
    
    	PR ld/16572
    	* readelf.c: Remove support for ELF_ARM_HASENTRY.
    
    include/
    2015-03-10  Matthew Wahab  <matthew.wahab@arm.com>
    
    	PR ld/16572
    	* elf/arm.h (EF_ARM_HASENTRY): Remove.

Diff:
---
 bfd/ChangeLog      |  7 +++++++
 bfd/elf32-arm.c    | 17 +----------------
 binutils/ChangeLog |  5 +++++
 binutils/readelf.c |  6 ------
 include/ChangeLog  |  5 +++++
 include/elf/arm.h  |  1 -
 6 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a370597..a6fbe59 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2015-03-10  Yuri Gribov  <y.gribov@samsung.arm>
+
+	PR ld/16572
+	* elf32-arm.c (elf32_arm_final_link_relocate): Remove support for
+	ELF_ARM_HASENTRY.
+	(elf32_arm_print_private_bfd_data): Likewise.
+
 2015-03-06  Nick Clifton  <nickc@redhat.com>
 
 	PR binutils/17765
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index c9e314e..113f4eb 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -8234,18 +8234,6 @@ elf32_arm_final_link_relocate (reloc_howto_type *           howto,
   if (r_type != howto->type)
     howto = elf32_arm_howto_from_type (r_type);
 
-  /* If the start address has been set, then set the EF_ARM_HASENTRY
-     flag.  Setting this more than once is redundant, but the cost is
-     not too high, and it keeps the code simple.
-
-     The test is done  here, rather than somewhere else, because the
-     start address is only set just before the final link commences.
-
-     Note - if the user deliberately sets a start address of 0, the
-     flag will not be set.  */
-  if (bfd_get_start_address (output_bfd) != 0)
-    elf_elfheader (output_bfd)->e_flags |= EF_ARM_HASENTRY;
-
   eh = (struct elf32_arm_link_hash_entry *) h;
   sgot = globals->root.sgot;
   local_got_offsets = elf_local_got_offsets (input_bfd);
@@ -12394,10 +12382,7 @@ elf32_arm_print_private_bfd_data (bfd *abfd, void * ptr)
   if (flags & EF_ARM_RELEXEC)
     fprintf (file, _(" [relocatable executable]"));
 
-  if (flags & EF_ARM_HASENTRY)
-    fprintf (file, _(" [has entry point]"));
-
-  flags &= ~ (EF_ARM_RELEXEC | EF_ARM_HASENTRY);
+  flags &= ~EF_ARM_RELEXEC;
 
   if (flags)
     fprintf (file, _("<Unrecognised flag bits set>"));
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 1124122..d10dd23 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-10  Yuri Gribov  <y.gribov@samsung.arm>
+
+	PR ld/16572
+	* readelf.c: Remove support for ELF_ARM_HASENTRY.
+
 2015-03-05  Nick Clifton  <nickc@redhat.com>
 
 	PR binutils/18064
diff --git a/binutils/readelf.c b/binutils/readelf.c
index 06fa8d5..d0b66ae 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -2280,12 +2280,6 @@ decode_ARM_machine_flags (unsigned e_flags, char buf[])
       e_flags &= ~ EF_ARM_RELEXEC;
     }
 
-  if (e_flags & EF_ARM_HASENTRY)
-    {
-      strcat (buf, ", has entry point");
-      e_flags &= ~ EF_ARM_HASENTRY;
-    }
-
   /* Now handle EABI specific flags.  */
   switch (eabi)
     {
diff --git a/include/ChangeLog b/include/ChangeLog
index cdce0a8..35da015 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-10  Matthew Wahab  <matthew.wahab@arm.com>
+
+	PR ld/16572
+	* elf/arm.h (EF_ARM_HASENTRY): Remove.
+
 2015-02-19  Pedro Alves  <palves@redhat.com>
 
 	* floatformat.h [__cplusplus]: Wrap in extern "C".
diff --git a/include/elf/arm.h b/include/elf/arm.h
index 7c025c1..c64e788 100644
--- a/include/elf/arm.h
+++ b/include/elf/arm.h
@@ -24,7 +24,6 @@
 
 /* Processor specific flags for the ELF header e_flags field.  */
 #define EF_ARM_RELEXEC     0x01
-#define EF_ARM_HASENTRY    0x02
 #define EF_ARM_INTERWORK   0x04
 #define EF_ARM_APCS_26     0x08
 #define EF_ARM_APCS_FLOAT  0x10