diff options
| -rw-r--r-- | binutils/ChangeLog | 5 | ||||
| -rw-r--r-- | binutils/objcopy.c | 6 | ||||
| -rw-r--r-- | include/ChangeLog | 4 | ||||
| -rw-r--r-- | include/elf/common.h | 1 |
4 files changed, 10 insertions, 6 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 5f6d98f..d139b13 100644 --- 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 04ba95e..06ecf3e 100644 --- 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 81486ad..ebda223 100644 --- 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 95a852f..6482f8c 100644 --- 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 */ |