diff options
author | Nick Clifton <nickc@redhat.com> | 2018-05-14 15:32:43 +0100 |
---|---|---|
committer | Nick Clifton <nickc@redhat.com> | 2018-05-14 15:32:43 +0100 |
commit | 864bb26cb34ce6f0a85f83ed38757d5512d07b2a (patch) | |
tree | 8a40c86dd1c10eb27592f4dafcf7025597d92a1b /gas/write.c | |
parent | c3533c4c7c5db84b27e4dc8994a3c3a893077c03 (diff) | |
download | fsf-binutils-gdb-864bb26cb34ce6f0a85f83ed38757d5512d07b2a.zip fsf-binutils-gdb-864bb26cb34ce6f0a85f83ed38757d5512d07b2a.tar.gz fsf-binutils-gdb-864bb26cb34ce6f0a85f83ed38757d5512d07b2a.tar.bz2 |
Stop generating GNU build notes for linkonce sections.
gas * write.c (maybe_generate_build_notes): Generate notes on a
per-code-section basis. Skip linkonce sections.
ld * testsuite/ld-elf/notes.exp: New file: Run new test.
* testsuite/ld-elf/note1_1.s: New file: Source file for test.
* testsuite/ld-elf/note1_2.s: New file: Source file for test.
* testsuite/ld-elf/note1.r: New file: Expected readelf output.
Diffstat (limited to 'gas/write.c')
-rw-r--r-- | gas/write.c | 92 |
1 files changed, 44 insertions, 48 deletions
diff --git a/gas/write.c b/gas/write.c index b902bf8..39c894a 100644 --- a/gas/write.c +++ b/gas/write.c @@ -1946,6 +1946,7 @@ maybe_generate_build_notes (void) segT sec; char * note; offsetT note_size; + offsetT total_size; offsetT desc_size; offsetT desc2_offset; int desc_reloc; @@ -1963,7 +1964,8 @@ maybe_generate_build_notes (void) SEC_READONLY | SEC_HAS_CONTENTS | SEC_DATA); bfd_set_section_alignment (stdoutput, sec, 2); - /* Create a version note. */ + /* Work out the size of the notes that we will create, + and the relocation we should use. */ if (bfd_arch_bits_per_address (stdoutput) <= 32) { note_size = 28; @@ -1997,65 +1999,59 @@ maybe_generate_build_notes (void) desc_reloc = BFD_RELOC_64; } - frag_now_fix (); - note = frag_more (note_size); - memset (note, 0, note_size); + /* We have to create a note for *each* code section. + Linker garbage collection might discard some. */ + total_size = 0; + note = NULL; - if (target_big_endian) - { - note[3] = 8; /* strlen (name) + 1. */ - note[7] = desc_size; /* Two 8-byte offsets. */ - note[10] = NT_GNU_BUILD_ATTRIBUTE_OPEN >> 8; - note[11] = NT_GNU_BUILD_ATTRIBUTE_OPEN & 0xff; - } - else - { - note[0] = 8; /* strlen (name) + 1. */ - note[4] = desc_size; /* Two 8-byte offsets. */ - note[8] = NT_GNU_BUILD_ATTRIBUTE_OPEN & 0xff; - note[9] = NT_GNU_BUILD_ATTRIBUTE_OPEN >> 8; - } - - /* The a1 version number indicates that this note was - generated by the assembler and not the gcc annobin plugin. */ - memcpy (note + 12, "GA$3a1", 8); - - /* Find the first code section symbol. */ for (sym = symbol_rootP; sym != NULL; sym = sym->sy_next) if (sym->bsym != NULL && sym->bsym->flags & BSF_SECTION_SYM && sym->bsym->section != NULL - && sym->bsym->section->flags & SEC_CODE) + /* Skip linkonce sections - we cannot these section symbols as they may disappear. */ + && (sym->bsym->section->flags & (SEC_CODE | SEC_LINK_ONCE)) == SEC_CODE + /* Not all linkonce sections are flagged... */ + && strncmp (S_GET_NAME (sym), ".gnu.linkonce", sizeof ".gnu.linkonce" - 1) != 0) { - /* Found one - now create a relocation against this symbol. */ - create_note_reloc (sec, sym, 20, desc_reloc, 0, note); - break; - } + /* Create a version note. */ + frag_now_fix (); + note = frag_more (note_size); + memset (note, 0, note_size); - /* Find the last code section symbol. */ - if (sym) - { - for (sym = symbol_lastP; sym != NULL; sym = sym->sy_previous) - if (sym->bsym != NULL - && sym->bsym->flags & BSF_SECTION_SYM - && sym->bsym->section != NULL - && sym->bsym->section->flags & SEC_CODE) + if (target_big_endian) { - /* Create a relocation against the end of this symbol. */ - create_note_reloc (sec, sym, desc2_offset, desc_reloc, - bfd_get_section_size (sym->bsym->section), - note); - break; + note[3] = 8; /* strlen (name) + 1. */ + note[7] = desc_size; /* Two 8-byte offsets. */ + note[10] = NT_GNU_BUILD_ATTRIBUTE_OPEN >> 8; + note[11] = NT_GNU_BUILD_ATTRIBUTE_OPEN & 0xff; + } + else + { + note[0] = 8; /* strlen (name) + 1. */ + note[4] = desc_size; /* Two 8-byte offsets. */ + note[8] = NT_GNU_BUILD_ATTRIBUTE_OPEN & 0xff; + note[9] = NT_GNU_BUILD_ATTRIBUTE_OPEN >> 8; } - } - /* else - if we were unable to find any code section symbols then - probably there is no code in the output. So leaving the start - and end values as zero in the note is OK. */ - /* FIXME: Maybe add a note recording the assembler command line and version ? */ + /* The a1 version number indicates that this note was + generated by the assembler and not the gcc annobin plugin. */ + memcpy (note + 12, "GA$3a1", 8); + + /* Create a relocation to install the start address of the note... */ + create_note_reloc (sec, sym, 20, desc_reloc, 0, note); + + /* ...and another one to install the end address. */ + create_note_reloc (sec, sym, desc2_offset, desc_reloc, + bfd_get_section_size (sym->bsym->section), + note); + + total_size += note_size; + /* FIXME: Maybe add a note recording the assembler command line and version ? */ + } /* Install the note(s) into the section. */ - bfd_set_section_contents (stdoutput, sec, (bfd_byte *) note, 0, note_size); + if (total_size) + bfd_set_section_contents (stdoutput, sec, (bfd_byte *) note, 0, total_size); subsegs_finish_section (sec); relax_segment (seg_info (sec)->frchainP->frch_root, sec, 0); size_seg (stdoutput, sec, NULL); |