X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Fwrite.c;h=5d9a2394224d0c36129cc70f0d5755c7014ff9bb;hb=4814632e69636177b71b8d091009a0ec614916ec;hp=b902bf85659024d9f6124fa817cf42bebc7d9ed9;hpb=0df8ad28f0f727fab3a696d6c98b9a8a77ee1024;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/write.c b/gas/write.c index b902bf8565..5d9a239422 100644 --- a/gas/write.c +++ b/gas/write.c @@ -1,5 +1,5 @@ /* write.c - emit .o file - Copyright (C) 1986-2018 Free Software Foundation, Inc. + Copyright (C) 1986-2020 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -143,8 +143,8 @@ static int n_fixups; static fixS * fix_new_internal (fragS *frag, /* Which frag? */ - int where, /* Where in that frag? */ - int size, /* 1, 2, or 4 usually. */ + unsigned long where, /* Where in that frag? */ + unsigned long size, /* 1, 2, or 4 usually. */ symbolS *add_symbol, /* X_add_symbol. */ symbolS *sub_symbol, /* X_op_symbol. */ offsetT offset, /* X_add_number. */ @@ -164,7 +164,7 @@ fix_new_internal (fragS *frag, /* Which frag? */ /* We've made fx_size a narrow field; check that it's wide enough. */ if (fixP->fx_size != size) { - as_bad (_("field fx_size too small to hold %d"), size); + as_bad (_("field fx_size too small to hold %lu"), size); abort (); } fixP->fx_addsy = add_symbol; @@ -174,9 +174,7 @@ fix_new_internal (fragS *frag, /* Which frag? */ fixP->fx_dot_frag = dot_frag; fixP->fx_pcrel = pcrel; fixP->fx_r_type = r_type; - fixP->fx_im_disp = 0; fixP->fx_pcrel_adjust = 0; - fixP->fx_bit_fixP = 0; fixP->fx_addnumber = 0; fixP->fx_tcbit = 0; fixP->fx_tcbit2 = 0; @@ -228,10 +226,10 @@ fix_new_internal (fragS *frag, /* Which frag? */ /* Create a fixup relative to a symbol (plus a constant). */ fixS * -fix_new (fragS *frag, /* Which frag? */ - int where, /* Where in that frag? */ - int size, /* 1, 2, or 4 usually. */ - symbolS *add_symbol, /* X_add_symbol. */ +fix_new (fragS *frag, /* Which frag? */ + unsigned long where, /* Where in that frag? */ + unsigned long size, /* 1, 2, or 4 usually. */ + symbolS *add_symbol, /* X_add_symbol. */ offsetT offset, /* X_add_number. */ int pcrel, /* TRUE if PC-relative relocation. */ RELOC_ENUM r_type /* Relocation type. */) @@ -246,8 +244,8 @@ fix_new (fragS *frag, /* Which frag? */ fixS * fix_new_exp (fragS *frag, /* Which frag? */ - int where, /* Where in that frag? */ - int size, /* 1, 2, or 4 usually. */ + unsigned long where, /* Where in that frag? */ + unsigned long size, /* 1, 2, or 4 usually. */ expressionS *exp, /* Expression. */ int pcrel, /* TRUE if PC-relative relocation. */ RELOC_ENUM r_type /* Relocation type. */) @@ -313,7 +311,7 @@ fix_new_exp (fragS *frag, /* Which frag? */ as for fix_new, except that WHERE is implicitly 0. */ fixS * -fix_at_start (fragS *frag, int size, symbolS *add_symbol, +fix_at_start (fragS *frag, unsigned long size, symbolS *add_symbol, offsetT offset, int pcrel, RELOC_ENUM r_type) { return fix_new_internal (frag, 0, size, add_symbol, @@ -361,8 +359,8 @@ record_alignment (/* Segment to which alignment pertains. */ if (seg == absolute_section) return; - if (align > bfd_get_section_alignment (stdoutput, seg)) - bfd_set_section_alignment (stdoutput, seg, align); + if (align > bfd_section_alignment (seg)) + bfd_set_section_alignment (seg, align); } int @@ -371,7 +369,7 @@ get_recorded_alignment (segT seg) if (seg == absolute_section) return 0; - return bfd_get_section_alignment (stdoutput, seg); + return bfd_section_alignment (seg); } /* Reset the section indices after removing the gas created sections. */ @@ -502,8 +500,8 @@ skip_align: md_convert_frag (stdoutput, sec, fragP); gas_assert (fragP->fr_next == NULL - || ((offsetT) (fragP->fr_next->fr_address - fragP->fr_address) - == fragP->fr_fix)); + || (fragP->fr_next->fr_address - fragP->fr_address + == fragP->fr_fix)); /* After md_convert_frag, we make the frag into a ".space 0". md_convert_frag() should set up any fixSs and constants @@ -557,7 +555,7 @@ relax_seg (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, void *xxx) } static void -size_seg (bfd *abfd, asection *sec, void *xxx ATTRIBUTE_UNUSED) +size_seg (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, void *xxx ATTRIBUTE_UNUSED) { flagword flags; fragS *fragp; @@ -582,8 +580,8 @@ size_seg (bfd *abfd, asection *sec, void *xxx ATTRIBUTE_UNUSED) else size = 0; - flags = bfd_get_section_flags (abfd, sec); - if (size == 0 && bfd_get_section_size (sec) != 0 && + flags = bfd_section_flags (sec); + if (size == 0 && bfd_section_size (sec) != 0 && (flags & SEC_HAS_CONTENTS) != 0) return; @@ -591,7 +589,7 @@ size_seg (bfd *abfd, asection *sec, void *xxx ATTRIBUTE_UNUSED) flags |= SEC_HAS_CONTENTS; flags &= ~SEC_RELOC; - x = bfd_set_section_flags (abfd, sec, flags); + x = bfd_set_section_flags (sec, flags); gas_assert (x); /* If permitted, allow the backend to pad out the section @@ -600,7 +598,7 @@ size_seg (bfd *abfd, asection *sec, void *xxx ATTRIBUTE_UNUSED) newsize = size; else newsize = md_section_align (sec, size); - x = bfd_set_section_size (abfd, sec, newsize); + x = bfd_set_section_size (sec, newsize); gas_assert (x); /* If the size had to be rounded up, add some padding in the last @@ -1093,7 +1091,7 @@ fixup_segment (fixS *fixP, segT this_segment) symbol_mark_used_in_reloc (fixP->fx_subsy); } - if (!fixP->fx_bit_fixP && !fixP->fx_no_overflow && fixP->fx_size != 0) + if (!fixP->fx_no_overflow && fixP->fx_size != 0) { if (fixP->fx_size < sizeof (valueT)) { @@ -1131,7 +1129,7 @@ fixup_segment (fixS *fixP, segT this_segment) (long) add_number, (long) (fragP->fr_address + fixP->fx_where)); #endif - } /* Not a bit fix. */ + } #ifdef TC_VALIDATE_FIX skip: ATTRIBUTE_UNUSED_LABEL @@ -1217,7 +1215,8 @@ get_frag_for_reloc (fragS *last_frag, } static void -write_relocs (bfd *abfd, asection *sec, void *xxx ATTRIBUTE_UNUSED) +write_relocs (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, + void *xxx ATTRIBUTE_UNUSED) { segment_info_type *seginfo = seg_info (sec); unsigned int n; @@ -1242,6 +1241,7 @@ write_relocs (bfd *abfd, asection *sec, void *xxx ATTRIBUTE_UNUSED) /* Extract relocs for this section from reloc_list. */ rp = &reloc_list; + my_reloc_list = NULL; while ((r = *rp) != NULL) { @@ -1264,7 +1264,7 @@ write_relocs (bfd *abfd, asection *sec, void *xxx ATTRIBUTE_UNUSED) for (fixp = seginfo->fix_root; fixp != (fixS *) NULL; fixp = fixp->fx_next) { int fx_size, slack; - offsetT loc; + valueT loc; arelent **reloc; #ifndef RELOC_EXPANSION_POSSIBLE arelent *rel; @@ -1346,9 +1346,9 @@ write_relocs (bfd *abfd, asection *sec, void *xxx ATTRIBUTE_UNUSED) if (n) { - flagword flags = bfd_get_section_flags (abfd, sec); + flagword flags = bfd_section_flags (sec); flags |= SEC_RELOC; - bfd_set_section_flags (abfd, sec, flags); + bfd_set_section_flags (sec, flags); bfd_set_reloc (stdoutput, sec, relocs, n); } @@ -1434,7 +1434,7 @@ compress_debug (bfd *abfd, asection *sec, void *xxx ATTRIBUTE_UNUSED) char *header; struct z_stream_s *strm; int x; - flagword flags = bfd_get_section_flags (abfd, sec); + flagword flags = bfd_section_flags (sec); unsigned int header_size, compression_header_size; if (seginfo == NULL @@ -1442,7 +1442,7 @@ compress_debug (bfd *abfd, asection *sec, void *xxx ATTRIBUTE_UNUSED) || (flags & (SEC_ALLOC | SEC_HAS_CONTENTS)) == SEC_ALLOC) return; - section_name = bfd_get_section_name (stdoutput, sec); + section_name = bfd_section_name (sec); if (strncmp (section_name, ".debug_", 7) != 0) return; @@ -1566,12 +1566,12 @@ compress_debug (bfd *abfd, asection *sec, void *xxx ATTRIBUTE_UNUSED) /* Update the section size and its name. */ bfd_update_compression_header (abfd, (bfd_byte *) header, sec); - x = bfd_set_section_size (abfd, sec, compressed_size); + x = bfd_set_section_size (sec, compressed_size); gas_assert (x); if (!compression_header_size) { compressed_name = concat (".z", section_name + 1, (char *) NULL); - bfd_section_name (stdoutput, sec) = compressed_name; + bfd_rename_section (sec, compressed_name); } } @@ -1600,7 +1600,7 @@ write_contents (bfd *abfd ATTRIBUTE_UNUSED, /* Write out the frags. */ if (seginfo == NULL - || !(bfd_get_section_flags (abfd, sec) & SEC_HAS_CONTENTS)) + || !(bfd_section_flags (sec) & SEC_HAS_CONTENTS)) return; for (f = seginfo->frchainP->frch_root; @@ -1816,7 +1816,7 @@ subsegs_finish_section (asection *s) do_not_pad_sections_to_alignment = 1; alignment = SUB_SEGMENT_ALIGN (now_seg, frchainP); - if ((bfd_get_section_flags (now_seg->owner, now_seg) & SEC_MERGE) + if ((bfd_section_flags (now_seg) & SEC_MERGE) && now_seg->entsize) { unsigned int entsize = now_seg->entsize; @@ -1876,7 +1876,7 @@ create_obj_attrs_section (void) s = subseg_new (name, 0); elf_section_type (s) = get_elf_backend_data (stdoutput)->obj_attrs_section_type; - bfd_set_section_flags (stdoutput, s, SEC_READONLY | SEC_DATA); + bfd_set_section_flags (s, SEC_READONLY | SEC_DATA); frag_now_fix (); p = frag_more (size); bfd_elf_set_obj_attr_contents (stdoutput, (bfd_byte *)p, size); @@ -1886,14 +1886,13 @@ create_obj_attrs_section (void) size_seg (stdoutput, s, NULL); } -#include "struc-symbol.h" - /* Create a relocation against an entry in a GNU Build attribute section. */ static void create_note_reloc (segT sec, symbolS * sym, - bfd_size_type offset, + bfd_size_type note_offset, + bfd_size_type desc2_offset, int reloc_type, bfd_vma addend, char * note) @@ -1903,10 +1902,10 @@ create_note_reloc (segT sec, reloc = XNEW (struct reloc_list); /* We create a .b type reloc as resolve_reloc_expr_symbols() has already been called. */ - reloc->u.b.sec = sec; - reloc->u.b.s = sym->bsym; + reloc->u.b.sec = sec; + reloc->u.b.s = symbol_get_bfdsym (sym); reloc->u.b.r.sym_ptr_ptr = & reloc->u.b.s; - reloc->u.b.r.address = offset; + reloc->u.b.r.address = note_offset + desc2_offset; reloc->u.b.r.addend = addend; reloc->u.b.r.howto = bfd_reloc_type_lookup (stdoutput, reloc_type); @@ -1931,12 +1930,12 @@ create_note_reloc (segT sec, if (target_big_endian) { if (bfd_arch_bits_per_address (stdoutput) <= 32) - note[offset + 3] = addend; + note[desc2_offset + 3] = addend; else - note[offset + 7] = addend; + note[desc2_offset + 7] = addend; } else - note[offset] = addend; + note[desc2_offset] = addend; } } @@ -1946,10 +1945,12 @@ maybe_generate_build_notes (void) segT sec; char * note; offsetT note_size; + offsetT total_size; offsetT desc_size; offsetT desc2_offset; int desc_reloc; symbolS * sym; + asymbol * bsym; if (! flag_generate_build_notes || bfd_get_section_by_name (stdoutput, @@ -1959,11 +1960,12 @@ maybe_generate_build_notes (void) /* Create a GNU Build Attribute section. */ sec = subseg_new (GNU_BUILD_ATTRS_SECTION_NAME, FALSE); elf_section_type (sec) = SHT_NOTE; - bfd_set_section_flags (stdoutput, sec, - SEC_READONLY | SEC_HAS_CONTENTS | SEC_DATA); - bfd_set_section_alignment (stdoutput, sec, 2); + bfd_set_section_flags (sec, (SEC_READONLY | SEC_HAS_CONTENTS | SEC_DATA + | SEC_OCTETS)); + bfd_set_section_alignment (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); - - 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) + /* We have to create a note for *each* code section. + Linker garbage collection might discard some. */ + total_size = 0; + note = NULL; + + for (sym = symbol_rootP; sym != NULL; sym = symbol_next (sym)) + if ((bsym = symbol_get_bfdsym (sym)) != NULL + && bsym->flags & BSF_SECTION_SYM + && bsym->section != NULL + /* Skip linkonce sections - we cannot use these section symbols as they may disappear. */ + && (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 - 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. */ + 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); - /* FIXME: Maybe add a note recording the assembler command line and version ? */ + /* Create a relocation to install the start address of the note... */ + create_note_reloc (sec, sym, total_size, 20, desc_reloc, 0, note); + + /* ...and another one to install the end address. */ + create_note_reloc (sec, sym, total_size, desc2_offset, desc_reloc, + bfd_section_size (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); @@ -2276,7 +2272,7 @@ write_object_file (void) if (IS_ELF) maybe_generate_build_notes (); #endif - + PROGRESS (1); #ifdef tc_frob_file_before_adjust @@ -2485,6 +2481,10 @@ write_object_file (void) } #ifdef TC_GENERIC_RELAX_TABLE +#ifndef md_generic_table_relax_frag +#define md_generic_table_relax_frag relax_frag +#endif + /* Relax a fragment by scanning TC_GENERIC_RELAX_TABLE. */ long @@ -2502,7 +2502,7 @@ relax_frag (segT segment, fragS *fragP, long stretch) const relax_typeS *table; target = fragP->fr_offset; - address = fragP->fr_address; + address = fragP->fr_address + fragP->fr_fix; table = TC_GENERIC_RELAX_TABLE; this_state = fragP->fr_subtype; start_type = this_type = table + this_state; @@ -2542,13 +2542,13 @@ relax_frag (segT segment, fragS *fragP, long stretch) negative. Don't allow this in case the negative reach is large enough to require a larger branch instruction. */ else if (target < address) - target = fragP->fr_next->fr_address + stretch; + return 0; } } - aim = target - address - fragP->fr_fix; + aim = target - address; #ifdef TC_PCREL_ADJUST - /* Currently only the ns32k family needs this. */ + /* Currently only the ns32k and arc needs this. */ aim += TC_PCREL_ADJUST (fragP); #endif @@ -3035,7 +3035,8 @@ relax_segment (struct frag *segment_frag_root, segT segment, int pass) #ifdef TC_GENERIC_RELAX_TABLE /* The default way to relax a frag is to look through TC_GENERIC_RELAX_TABLE. */ - growth = relax_frag (segment, fragP, stretch); + growth = md_generic_table_relax_frag (segment, fragP, + stretch); #endif /* TC_GENERIC_RELAX_TABLE */ #endif break; @@ -3147,14 +3148,6 @@ print_fixup (fixS *fixp) fprintf (stderr, " pcrel"); if (fixp->fx_pcrel_adjust) fprintf (stderr, " pcrel_adjust=%d", fixp->fx_pcrel_adjust); - if (fixp->fx_im_disp) - { -#ifdef TC_NS32K - fprintf (stderr, " im_disp=%d", fixp->fx_im_disp); -#else - fprintf (stderr, " im_disp"); -#endif - } if (fixp->fx_tcbit) fprintf (stderr, " tcbit"); if (fixp->fx_done)