diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2021-11-30 20:40:38 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2021-12-01 16:40:43 -0800 |
| commit | 1f1d0f8888a6c944e612b416a2a6e11abcf5199f (patch) | |
| tree | c92392d84e68d9335fb7fbd23f075ad1cfb0f449 /ld/ldelf.c | |
| parent | b18c2bb9f30eda51609cf3d2277960fc03920650 (diff) | |
| download | binutils-gdb-1f1d0f8888a6c944e612b416a2a6e11abcf5199f.tar.gz | |
elf: Discard input .note.gnu.build-id sections
1. Discard input .note.gnu.build-id sections.
2. Clear the build ID field before writing.
3. Use bfd_make_section_anyway_with_flags to create the output
.note.gnu.build-id section.
PR ld/28639
* ldelf.c (ldelf_after_open): Discard input .note.gnu.build-id
sections, excluding the first one.
(write_build_id): Clear the build ID field before writing.
(ldelf_setup_build_id): Use bfd_make_section_anyway_with_flags
to create the output .note.gnu.build-id section.
* testsuite/ld-elf/build-id.exp: New file.
* testsuite/ld-elf/pr28639a.rd: Likewise.
* testsuite/ld-elf/pr28639b.rd: Likewise.
* testsuite/ld-elf/pr28639c.rd: Likewise.
* testsuite/ld-elf/pr28639d.rd: Likewise.
Diffstat (limited to 'ld/ldelf.c')
| -rw-r--r-- | ld/ldelf.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/ld/ldelf.c b/ld/ldelf.c index 0c39eb6024f..529992b02ae 100644 --- a/ld/ldelf.c +++ b/ld/ldelf.c @@ -1043,6 +1043,15 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd, /* Do not allow executable files to be used as inputs to the link. */ for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) { + /* Discard input .note.gnu.build-id sections. */ + s = bfd_get_section_by_name (abfd, ".note.gnu.build-id"); + while (s != NULL) + { + if (s != elf_tdata (link_info.output_bfd)->o->build_id.sec) + s->flags |= SEC_EXCLUDE; + s = bfd_get_next_section_by_name (NULL, s); + } + if (abfd->xvec->flavour == bfd_target_elf_flavour && !bfd_input_just_syms (abfd) && elf_tdata (abfd) != NULL @@ -1386,6 +1395,9 @@ write_build_id (bfd *abfd) id_bits = contents + size; size = asec->size - size; + /* Clear the build ID field. */ + memset (id_bits, 0, size); + bfd_h_put_32 (abfd, sizeof "GNU", &e_note->namesz); bfd_h_put_32 (abfd, size, &e_note->descsz); bfd_h_put_32 (abfd, NT_GNU_BUILD_ID, &e_note->type); @@ -1417,7 +1429,8 @@ ldelf_setup_build_id (bfd *ibfd) flags = (SEC_ALLOC | SEC_LOAD | SEC_IN_MEMORY | SEC_LINKER_CREATED | SEC_READONLY | SEC_DATA); - s = bfd_make_section_with_flags (ibfd, ".note.gnu.build-id", flags); + s = bfd_make_section_anyway_with_flags (ibfd, ".note.gnu.build-id", + flags); if (s != NULL && bfd_set_section_alignment (s, 2)) { struct elf_obj_tdata *t = elf_tdata (link_info.output_bfd); |