Remove references to the unofficial SHF_GNU_BUILD_NOTE section flag.

binutils	* objcopy.c (is_mergeable_note_section): Remove reference to
	SHF_GNU_BUILD_NOTE.

include	* elf/common.h (SHF_GNU_BUILD_NOTE): Delete.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 5f6d98f0701bf507f6be82f0a1663597d07bd3ef..d139b1365f7a54edb821a94bad2d0cd6fa0d9b31 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2020-12-07  Nick Clifton  <nickc@redhat.com>
+
+       * objcopy.c (is_mergeable_note_section): Remove reference to
+       SHF_GNU_BUILD_NOTE.
+
 2020-12-07  Siddhesh Poyarekar  <siddhesh@sourceware.org>
 
        PR 26945

diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index 04ba95ec14014d086a7669e8f6cf33f55cf2d6da..06ecf3e9704188496c324d1c0864c4041c263ff5 100644 (file)
--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -1311,11 +1311,7 @@ is_mergeable_note_section (bfd * abfd, asection * sec)
       && elf_section_data (sec)->this_hdr.sh_type == SHT_NOTE
       /* FIXME: We currently only support merging GNU_BUILD_NOTEs.
         We should add support for more note types.  */
-      && ((elf_section_data (sec)->this_hdr.sh_flags & SHF_GNU_BUILD_NOTE) != 0
-         /* Old versions of GAS (prior to 2.27) could not set the section
-            flags to OS-specific values, so we also accept sections that
-            start with the expected name.  */
-         || (CONST_STRNEQ (sec->name, GNU_BUILD_ATTRS_SECTION_NAME))))
+      && (CONST_STRNEQ (sec->name, GNU_BUILD_ATTRS_SECTION_NAME)))
     return TRUE;
 
   return FALSE;

diff --git a/include/ChangeLog b/include/ChangeLog
index 81486ad7cbd155aa02217d09d2f16cbc4c6525be..ebda223cb11ca9d887caa119d9dd9cf5aa342106 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2020-12-07  Nick Clifton  <nickc@redhat.com>
+
+       * elf/common.h (SHF_GNU_BUILD_NOTE): Delete.
+
 2020-12-01  Nelson Chu  <nelson.chu@sifive.com>
 
        * opcode/riscv.h (RISCV_UNKNOWN_VERSION): added.

diff --git a/include/elf/common.h b/include/elf/common.h
index 95a852f0cf5341b8214090fd968cc2ef689fb013..6482f8c0bd17780a6ca7ba7c44e9a8bec8344d81 100644 (file)
--- a/include/elf/common.h
+++ b/include/elf/common.h
@@ -553,7 +553,6 @@
 
 /* #define SHF_MASKOS  0x0F000000    *//* OS-specific semantics */
 #define SHF_MASKOS     0x0FF00000      /* New value, Oct 4, 1999 Draft */
-#define SHF_GNU_BUILD_NOTE    (1 << 20)        /* Section contains GNU BUILD ATTRIBUTE notes.  */
 #define SHF_GNU_RETAIN       (1 << 21) /* Section should not be garbage collected by the linker.  */
 #define SHF_MASKPROC   0xF0000000      /* Processor-specific semantics */