X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Fwrite.c;h=29ea2843857fb521dd25d46326057da28e79a0cf;hb=36fc76aebb7315571094d66b35e13d69d512fbe2;hp=69c6229865b2501f32f1a0c245bb5b683cfb6474;hpb=c9dea48b1faf7a8a243673dd32a0089036f7ea36;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/write.c b/gas/write.c index 69c6229865..29ea284385 100644 --- a/gas/write.c +++ b/gas/write.c @@ -1,6 +1,6 @@ /* write.c - emit .o file Copyright 1986, 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, - 1998, 1999, 2000, 2001, 2002, 2003, 2004 + 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free - Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA + 02110-1301, USA. */ /* This thing should be set up to do byteordering correctly. But... */ @@ -27,6 +27,7 @@ #include "obstack.h" #include "output-file.h" #include "dwarf2dbg.h" +#include "libbfd.h" #ifndef TC_ADJUST_RELOC_COUNT #define TC_ADJUST_RELOC_COUNT(FIX, COUNT) @@ -45,7 +46,6 @@ #ifndef TC_FORCE_RELOCATION_LOCAL #define TC_FORCE_RELOCATION_LOCAL(FIX) \ (!(FIX)->fx_pcrel \ - || (FIX)->fx_plt \ || TC_FORCE_RELOCATION (FIX)) #endif @@ -71,13 +71,9 @@ /* The PA needs this for PIC code generation. */ #define TC_VALIDATE_FIX_SUB(FIX) 1 #else -#ifdef BFD_ASSEMBLER #define TC_VALIDATE_FIX_SUB(FIX) \ ((FIX)->fx_r_type == BFD_RELOC_GPREL32 \ || (FIX)->fx_r_type == BFD_RELOC_GPREL16) -#else -#define TC_VALIDATE_FIX_SUB(FIX) 0 -#endif #endif #endif @@ -97,6 +93,20 @@ #define MD_PCREL_FROM_SECTION(FIX, SEC) md_pcrel_from (FIX) #endif +#ifndef TC_FAKE_LABEL +#define TC_FAKE_LABEL(NAME) (strcmp ((NAME), FAKE_LABEL_NAME) == 0) +#endif + +/* Positive values of TC_FX_SIZE_SLACK allow a target to define + fixups that far past the end of a frag. Having such fixups + is of course most most likely a bug in setting fx_size correctly. + A negative value disables the fixup check entirely, which is + appropriate for something like the Renesas / SuperH SH_COUNT + reloc. */ +#ifndef TC_FX_SIZE_SLACK +#define TC_FX_SIZE_SLACK(FIX) 0 +#endif + /* Used to control final evaluation of expressions. */ int finalize_syms = 0; @@ -107,79 +117,20 @@ symbolS *abs_section_sym; /* Remember the value of dot when parsing expressions. */ addressT dot_value; -void print_fixup (fixS *); +/* Relocs generated by ".reloc" pseudo. */ +struct reloc_list* reloc_list; -#ifdef BFD_ASSEMBLER -static void renumber_sections (bfd *, asection *, PTR); +void print_fixup (fixS *); /* We generally attach relocs to frag chains. However, after we have chained these all together into a segment, any relocs we add after that must be attached to a segment. This will include relocs added in md_estimate_size_for_relax, for example. */ static int frags_chained = 0; -#endif - -#ifndef BFD_ASSEMBLER - -#ifndef MANY_SEGMENTS -struct frag *text_frag_root; -struct frag *data_frag_root; -struct frag *bss_frag_root; - -struct frag *text_last_frag; /* Last frag in segment. */ -struct frag *data_last_frag; /* Last frag in segment. */ -static struct frag *bss_last_frag; /* Last frag in segment. */ -#endif - -#ifndef BFD -static object_headers headers; -#endif - -long string_byte_count; -char *next_object_file_charP; /* Tracks object file bytes. */ - -#ifndef OBJ_VMS -int magic_number_for_object_file = DEFAULT_MAGIC_NUMBER_FOR_OBJECT_FILE; -#endif - -#endif /* BFD_ASSEMBLER */ static int n_fixups; -#ifdef BFD_ASSEMBLER #define RELOC_ENUM enum bfd_reloc_code_real -#else -#define RELOC_ENUM int -#endif - -static fixS *fix_new_internal (fragS *, int where, int size, - symbolS *add, symbolS *sub, - offsetT offset, int pcrel, - RELOC_ENUM r_type); -#if defined (BFD_ASSEMBLER) || (!defined (BFD) && !defined (OBJ_VMS)) -static long fixup_segment (fixS *, segT); -#endif -static relax_addressT relax_align (relax_addressT addr, int align); -#if defined (BFD_ASSEMBLER) || ! defined (BFD) -static fragS *chain_frchains_together_1 (segT, struct frchain *); -#endif -#ifdef BFD_ASSEMBLER -static void chain_frchains_together (bfd *, segT, PTR); -static void cvt_frag_to_fill (segT, fragS *); -static void adjust_reloc_syms (bfd *, asection *, PTR); -static void fix_segment (bfd *, asection *, PTR); -static void write_relocs (bfd *, asection *, PTR); -static void write_contents (bfd *, asection *, PTR); -static void set_symtab (void); -#endif -#if defined (BFD_ASSEMBLER) || (! defined (BFD) && ! defined (OBJ_AOUT)) -static void merge_data_into_text (void); -#endif -#if ! defined (BFD_ASSEMBLER) && ! defined (BFD) -static void cvt_frag_to_fill (object_headers *, segT, fragS *); -static void remove_subsegs (frchainS *, int, fragS **, fragS **); -static void relax_and_size_all_segments (void); -#endif /* Create a fixS in obstack 'notes'. */ @@ -197,7 +148,7 @@ fix_new_internal (fragS *frag, /* Which frag? */ n_fixups++; - fixP = (fixS *) obstack_alloc (¬es, sizeof (fixS)); + fixP = obstack_alloc (¬es, sizeof (fixS)); fixP->fx_frag = frag; fixP->fx_where = where; @@ -213,15 +164,13 @@ fix_new_internal (fragS *frag, /* Which frag? */ fixP->fx_offset = offset; fixP->fx_dot_value = dot_value; fixP->fx_pcrel = pcrel; - fixP->fx_plt = 0; -#if defined(NEED_FX_R_TYPE) || defined (BFD_ASSEMBLER) fixP->fx_r_type = r_type; -#endif 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; fixP->fx_done = 0; fixP->fx_no_overflow = 0; fixP->fx_signed = 0; @@ -243,14 +192,12 @@ fix_new_internal (fragS *frag, /* Which frag? */ time option. xoxorich. */ { -#ifdef BFD_ASSEMBLER fixS **seg_fix_rootP = (frags_chained ? &seg_info (now_seg)->fix_root : &frchain_now->fix_root); fixS **seg_fix_tailP = (frags_chained ? &seg_info (now_seg)->fix_tail : &frchain_now->fix_tail); -#endif #ifdef REVERSE_SORT_RELOCS @@ -330,16 +277,7 @@ fix_new_exp (fragS *frag, /* Which frag? */ case O_symbol_rva: add = exp->X_add_symbol; off = exp->X_add_number; - -#if defined(BFD_ASSEMBLER) r_type = BFD_RELOC_RVA; -#else -#if defined(TC_RVA_RELOC) - r_type = TC_RVA_RELOC; -#else - as_fatal (_("rva not supported")); -#endif -#endif break; case O_uminus: @@ -369,11 +307,13 @@ fix_new_exp (fragS *frag, /* Which frag? */ int generic_force_reloc (fixS *fix) { -#ifdef BFD_ASSEMBLER if (fix->fx_r_type == BFD_RELOC_VTABLE_INHERIT || fix->fx_r_type == BFD_RELOC_VTABLE_ENTRY) return 1; -#endif + + if (fix->fx_addsy == NULL) + return 0; + return S_FORCE_RELOC (fix->fx_addsy, fix->fx_subsy == NULL); } @@ -389,10 +329,6 @@ append (char **charPP, char *fromP, unsigned long length) *charPP += length; } -#ifndef BFD_ASSEMBLER -int section_alignment[SEG_MAXIMUM_ORDINAL]; -#endif - /* This routine records the largest alignment seen for each segment. If the beginning of the segment is aligned on the worst-case boundary, all of the other alignments within it will work. At @@ -407,13 +343,9 @@ record_alignment (/* Segment to which alignment pertains. */ { if (seg == absolute_section) return; -#ifdef BFD_ASSEMBLER + if ((unsigned int) align > bfd_get_section_alignment (stdoutput, seg)) bfd_set_section_alignment (stdoutput, seg, align); -#else - if (align > section_alignment[(int) seg]) - section_alignment[(int) seg] = align; -#endif } int @@ -421,19 +353,14 @@ get_recorded_alignment (segT seg) { if (seg == absolute_section) return 0; -#ifdef BFD_ASSEMBLER + return bfd_get_section_alignment (stdoutput, seg); -#else - return section_alignment[(int) seg]; -#endif } -#ifdef BFD_ASSEMBLER - /* Reset the section indices after removing the gas created sections. */ static void -renumber_sections (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, PTR countparg) +renumber_sections (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, void *countparg) { int *countp = (int *) countparg; @@ -441,24 +368,17 @@ renumber_sections (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, PTR countparg) ++*countp; } -#endif /* defined (BFD_ASSEMBLER) */ - -#if defined (BFD_ASSEMBLER) || ! defined (BFD) - static fragS * chain_frchains_together_1 (segT section, struct frchain *frchp) { fragS dummy, *prev_frag = &dummy; -#ifdef BFD_ASSEMBLER fixS fix_dummy, *prev_fix = &fix_dummy; -#endif - for (; frchp && frchp->frch_seg == section; frchp = frchp->frch_next) + for (; frchp; frchp = frchp->frch_next) { prev_frag->fr_next = frchp->frch_root; prev_frag = frchp->frch_last; assert (prev_frag->fr_type != 0); -#ifdef BFD_ASSEMBLER if (frchp->fix_root != (fixS *) NULL) { if (seg_info (section)->fix_root == (fixS *) NULL) @@ -467,21 +387,17 @@ chain_frchains_together_1 (segT section, struct frchain *frchp) seg_info (section)->fix_tail = frchp->fix_tail; prev_fix = frchp->fix_tail; } -#endif } assert (prev_frag->fr_type != 0); + assert (prev_frag != &dummy); prev_frag->fr_next = 0; return prev_frag; } -#endif - -#ifdef BFD_ASSEMBLER - static void chain_frchains_together (bfd *abfd ATTRIBUTE_UNUSED, segT section, - PTR xxx ATTRIBUTE_UNUSED) + void *xxx ATTRIBUTE_UNUSED) { segment_info_type *info; @@ -497,28 +413,8 @@ chain_frchains_together (bfd *abfd ATTRIBUTE_UNUSED, frags_chained = 1; } -#endif - -#if !defined (BFD) && !defined (BFD_ASSEMBLER) - -static void -remove_subsegs (frchainS *head, int seg, fragS **root, fragS **last) -{ - *root = head->frch_root; - *last = chain_frchains_together_1 (seg, head); -} - -#endif /* BFD */ - -#if defined (BFD_ASSEMBLER) || !defined (BFD) - -#ifdef BFD_ASSEMBLER static void cvt_frag_to_fill (segT sec ATTRIBUTE_UNUSED, fragS *fragP) -#else -static void -cvt_frag_to_fill (object_headers *headersP, segT sec, fragS *fragP) -#endif { switch (fragP->fr_type) { @@ -572,11 +468,7 @@ cvt_frag_to_fill (object_headers *headersP, segT sec, fragS *fragP) break; case rs_machine_dependent: -#ifdef BFD_ASSEMBLER md_convert_frag (stdoutput, sec, fragP); -#else - md_convert_frag (headersP, sec, fragP); -#endif assert (fragP->fr_next == NULL || ((offsetT) (fragP->fr_next->fr_address - fragP->fr_address) @@ -616,28 +508,25 @@ cvt_frag_to_fill (object_headers *headersP, segT sec, fragS *fragP) #endif } -#endif /* defined (BFD_ASSEMBLER) || !defined (BFD) */ - -#ifdef BFD_ASSEMBLER -static void relax_seg (bfd *, asection *, PTR); +struct relax_seg_info +{ + int pass; + int changed; +}; static void -relax_seg (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, PTR xxx) +relax_seg (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, void *xxx) { segment_info_type *seginfo = seg_info (sec); + struct relax_seg_info *info = (struct relax_seg_info *) xxx; if (seginfo && seginfo->frchainP - && relax_segment (seginfo->frchainP->frch_root, sec)) - { - int *result = (int *) xxx; - *result = 1; - } + && relax_segment (seginfo->frchainP->frch_root, sec, info->pass)) + info->changed = 1; } -static void size_seg (bfd *, asection *, PTR); - static void -size_seg (bfd *abfd, asection *sec, PTR xxx ATTRIBUTE_UNUSED) +size_seg (bfd *abfd, asection *sec, void *xxx ATTRIBUTE_UNUSED) { flagword flags; fragS *fragp; @@ -667,11 +556,7 @@ size_seg (bfd *abfd, asection *sec, PTR xxx ATTRIBUTE_UNUSED) if (size > 0 && ! seginfo->bss) flags |= SEC_HAS_CONTENTS; - /* @@ This is just an approximation. */ - if (seginfo && seginfo->fix_root) - flags |= SEC_RELOC; - else - flags &= ~SEC_RELOC; + flags &= ~SEC_RELOC; x = bfd_set_section_flags (abfd, sec, flags); assert (x); @@ -709,12 +594,8 @@ size_seg (bfd *abfd, asection *sec, PTR xxx ATTRIBUTE_UNUSED) #ifdef DEBUG2 static void -dump_section_relocs (abfd, sec, stream_) - bfd *abfd ATTRIBUTE_UNUSED; - asection *sec; - char *stream_; +dump_section_relocs (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, FILE *stream) { - FILE *stream = (FILE *) stream_; segment_info_type *seginfo = seg_info (sec); fixS *fixp = seginfo->fix_root; @@ -746,13 +627,93 @@ dump_section_relocs (abfd, sec, stream_) #define EMIT_SECTION_SYMBOLS 1 #endif +/* Resolve U.A.OFFSET_SYM and U.A.SYM fields of RELOC_LIST entries, + and check for validity. Convert RELOC_LIST from using U.A fields + to U.B fields. */ +static void +resolve_reloc_expr_symbols (void) +{ + struct reloc_list *r; + + for (r = reloc_list; r; r = r->next) + { + expressionS *symval; + symbolS *sym; + bfd_vma offset, addend; + asection *sec; + reloc_howto_type *howto; + + resolve_symbol_value (r->u.a.offset_sym); + symval = symbol_get_value_expression (r->u.a.offset_sym); + + offset = 0; + sym = NULL; + if (symval->X_op == O_constant) + sym = r->u.a.offset_sym; + else if (symval->X_op == O_symbol) + { + sym = symval->X_add_symbol; + offset = symval->X_add_number; + symval = symbol_get_value_expression (symval->X_add_symbol); + } + if (sym == NULL + || symval->X_op != O_constant + || (sec = S_GET_SEGMENT (sym)) == NULL + || !SEG_NORMAL (sec)) + { + as_bad_where (r->file, r->line, _("invalid offset expression")); + sec = NULL; + } + else + offset += S_GET_VALUE (sym); + + sym = NULL; + addend = r->u.a.addend; + if (r->u.a.sym != NULL) + { + resolve_symbol_value (r->u.a.sym); + symval = symbol_get_value_expression (r->u.a.sym); + if (symval->X_op == O_constant) + sym = r->u.a.sym; + else if (symval->X_op == O_symbol) + { + sym = symval->X_add_symbol; + addend += symval->X_add_number; + symval = symbol_get_value_expression (symval->X_add_symbol); + } + if (symval->X_op != O_constant) + { + as_bad_where (r->file, r->line, _("invalid reloc expression")); + sec = NULL; + } + else if (sym != NULL) + symbol_mark_used_in_reloc (sym); + } + if (sym == NULL) + { + if (abs_section_sym == NULL) + abs_section_sym = section_symbol (absolute_section); + sym = abs_section_sym; + } + + howto = r->u.a.howto; + + r->u.b.sec = sec; + r->u.b.s = symbol_get_bfdsym (sym); + r->u.b.r.sym_ptr_ptr = &r->u.b.s; + r->u.b.r.address = offset; + r->u.b.r.addend = addend; + r->u.b.r.howto = howto; + } +} + /* This pass over fixups decides whether symbols can be replaced with section symbols. */ static void adjust_reloc_syms (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, - PTR xxx ATTRIBUTE_UNUSED) + void *xxx ATTRIBUTE_UNUSED) { segment_info_type *seginfo = seg_info (sec); fixS *fixp; @@ -787,18 +748,23 @@ adjust_reloc_syms (bfd *abfd ATTRIBUTE_UNUSED, if (fixp->fx_subsy != NULL) resolve_symbol_value (fixp->fx_subsy); - /* If this symbol is equated to an undefined symbol, convert - the fixup to being against that symbol. */ - if (symbol_equated_reloc_p (sym)) + /* If this symbol is equated to an undefined or common symbol, + convert the fixup to being against that symbol. */ + while (symbol_equated_reloc_p (sym) + || S_IS_WEAKREFR (sym)) { + symbolS *newsym = symbol_get_value_expression (sym)->X_add_symbol; + if (sym == newsym) + break; fixp->fx_offset += symbol_get_value_expression (sym)->X_add_number; - sym = symbol_get_value_expression (sym)->X_add_symbol; - fixp->fx_addsy = sym; + fixp->fx_addsy = newsym; + sym = newsym; } if (symbol_mri_common_p (sym)) { - /* These symbols are handled specially in fixup_segment. */ + fixp->fx_offset += S_GET_VALUE (sym); + fixp->fx_addsy = symbol_get_value_expression (sym)->X_add_symbol; continue; } @@ -827,14 +793,14 @@ adjust_reloc_syms (bfd *abfd ATTRIBUTE_UNUSED, if (bfd_is_abs_section (symsec)) { /* The fixup_segment routine normally will not use this - symbol in a relocation. */ + symbol in a relocation. */ continue; } /* Don't try to reduce relocs which refer to non-local symbols - in .linkonce sections. It can lead to confusion when a - debugging section refers to a .linkonce section. I hope - this will always be correct. */ + in .linkonce sections. It can lead to confusion when a + debugging section refers to a .linkonce section. I hope + this will always be correct. */ if (symsec != sec && ! S_IS_LOCAL (sym)) { if ((symsec->flags & SEC_LINK_ONCE) != 0 @@ -871,190 +837,367 @@ adjust_reloc_syms (bfd *abfd ATTRIBUTE_UNUSED, dump_section_relocs (abfd, sec, stderr); } -static void -fix_segment (bfd *abfd ATTRIBUTE_UNUSED, - asection *sec, - PTR xxx ATTRIBUTE_UNUSED) -{ - segment_info_type *seginfo = seg_info (sec); +/* fixup_segment() - fixup_segment (seginfo->fix_root, sec); -} + Go through all the fixS's in a segment and see which ones can be + handled now. (These consist of fixS where we have since discovered + the value of a symbol, or the address of the frag involved.) + For each one, call md_apply_fix to put the fix into the frag data. -static void -write_relocs (bfd *abfd, asection *sec, PTR xxx ATTRIBUTE_UNUSED) -{ - segment_info_type *seginfo = seg_info (sec); - unsigned int i; - unsigned int n; - arelent **relocs; - fixS *fixp; - char *err; + Result is a count of how many relocation structs will be needed to + handle the remaining fixS's that we couldn't completely handle here. + These will be output later by emit_relocations(). */ - /* If seginfo is NULL, we did not create this section; don't do - anything with it. */ - if (seginfo == NULL) - return; +static long +fixup_segment (fixS *fixP, segT this_segment) +{ + long seg_reloc_count = 0; + valueT add_number; + fragS *fragP; + segT add_symbol_segment = absolute_section; - n = 0; - for (fixp = seginfo->fix_root; fixp; fixp = fixp->fx_next) - n++; + if (fixP != NULL && abs_section_sym == NULL) + abs_section_sym = section_symbol (absolute_section); -#ifndef RELOC_EXPANSION_POSSIBLE - /* Set up reloc information as well. */ - relocs = (arelent **) xcalloc (n, sizeof (arelent *)); + /* If the linker is doing the relaxing, we must not do any fixups. - i = 0; - for (fixp = seginfo->fix_root; fixp != (fixS *) NULL; fixp = fixp->fx_next) + Well, strictly speaking that's not true -- we could do any that + are PC-relative and don't cross regions that could change size. + And for the i960 we might be able to turn callx/callj into bal + anyways in cases where we know the maximum displacement. */ + if (linkrelax && TC_LINKRELAX_FIXUP (this_segment)) { - arelent *reloc; - bfd_reloc_status_type s; - symbolS *sym; - - if (fixp->fx_done) - { - n--; - continue; - } - - /* If this is an undefined symbol which was equated to another - symbol, then generate the reloc against the latter symbol - rather than the former. */ - sym = fixp->fx_addsy; - while (symbol_equated_reloc_p (sym)) - { - symbolS *n; - - /* We must avoid looping, as that can occur with a badly - written program. */ - n = symbol_get_value_expression (sym)->X_add_symbol; - if (n == sym) - break; - fixp->fx_offset += symbol_get_value_expression (sym)->X_add_number; - sym = n; - } - fixp->fx_addsy = sym; - - reloc = tc_gen_reloc (sec, fixp); - if (!reloc) - { - n--; - continue; - } - - /* - This test is triggered inappropriately for the SH: - if (fixp->fx_where + fixp->fx_size - > fixp->fx_frag->fr_fix + fixp->fx_frag->fr_offset) - abort (); - */ - - s = bfd_install_relocation (stdoutput, reloc, - fixp->fx_frag->fr_literal, - fixp->fx_frag->fr_address, - sec, &err); - switch (s) - { - case bfd_reloc_ok: - break; - case bfd_reloc_overflow: - as_bad_where (fixp->fx_file, fixp->fx_line, - _("relocation overflow")); - break; - case bfd_reloc_outofrange: - as_bad_where (fixp->fx_file, fixp->fx_line, - _("relocation out of range")); - break; - default: - as_fatal (_("%s:%u: bad return from bfd_install_relocation: %x"), - fixp->fx_file, fixp->fx_line, s); - } - relocs[i++] = reloc; + for (; fixP; fixP = fixP->fx_next) + if (!fixP->fx_done) + { + if (fixP->fx_addsy == NULL) + { + /* There was no symbol required by this relocation. + However, BFD doesn't really handle relocations + without symbols well. So fake up a local symbol in + the absolute section. */ + fixP->fx_addsy = abs_section_sym; + } + symbol_mark_used_in_reloc (fixP->fx_addsy); + if (fixP->fx_subsy != NULL) + symbol_mark_used_in_reloc (fixP->fx_subsy); + seg_reloc_count++; + } + TC_ADJUST_RELOC_COUNT (fixP, seg_reloc_count); + return seg_reloc_count; } -#else - n = n * MAX_RELOC_EXPANSION; - /* Set up reloc information as well. */ - relocs = (arelent **) xcalloc (n, sizeof (arelent *)); - i = 0; - for (fixp = seginfo->fix_root; fixp != (fixS *) NULL; fixp = fixp->fx_next) + for (; fixP; fixP = fixP->fx_next) { - arelent **reloc; - bfd_reloc_status_type s; - symbolS *sym; - int j; - - if (fixp->fx_done) - { - n--; - continue; - } +#ifdef DEBUG5 + fprintf (stderr, "\nprocessing fixup:\n"); + print_fixup (fixP); +#endif - /* If this is an undefined symbol which was equated to another - symbol, then generate the reloc against the latter symbol - rather than the former. */ - sym = fixp->fx_addsy; - while (symbol_equated_reloc_p (sym)) - { - symbolS *n; - - /* We must avoid looping, as that can occur with a badly - written program. */ - n = symbol_get_value_expression (sym)->X_add_symbol; - if (n == sym) - break; - fixp->fx_offset += symbol_get_value_expression (sym)->X_add_number; - sym = n; - } - fixp->fx_addsy = sym; + fragP = fixP->fx_frag; + know (fragP); +#ifdef TC_VALIDATE_FIX + TC_VALIDATE_FIX (fixP, this_segment, skip); +#endif + add_number = fixP->fx_offset; - reloc = tc_gen_reloc (sec, fixp); + if (fixP->fx_addsy != NULL) + add_symbol_segment = S_GET_SEGMENT (fixP->fx_addsy); - for (j = 0; reloc[j]; j++) - { - relocs[i++] = reloc[j]; - assert (i <= n); - } - if (fixp->fx_where + fixp->fx_size - > fixp->fx_frag->fr_fix + fixp->fx_frag->fr_offset) - as_bad_where (fixp->fx_file, fixp->fx_line, - _("internal error: fixup not contained within frag")); - for (j = 0; reloc[j]; j++) + if (fixP->fx_subsy != NULL) { - s = bfd_install_relocation (stdoutput, reloc[j], - fixp->fx_frag->fr_literal, - fixp->fx_frag->fr_address, - sec, &err); - switch (s) + segT sub_symbol_segment; + resolve_symbol_value (fixP->fx_subsy); + sub_symbol_segment = S_GET_SEGMENT (fixP->fx_subsy); + if (fixP->fx_addsy != NULL + && sub_symbol_segment == add_symbol_segment + && !TC_FORCE_RELOCATION_SUB_SAME (fixP, add_symbol_segment)) { - case bfd_reloc_ok: - break; - case bfd_reloc_overflow: - as_bad_where (fixp->fx_file, fixp->fx_line, - _("relocation overflow")); - break; - case bfd_reloc_outofrange: - as_bad_where (fixp->fx_file, fixp->fx_line, - _("relocation out of range")); - break; - default: - as_fatal (_("%s:%u: bad return from bfd_install_relocation: %x"), - fixp->fx_file, fixp->fx_line, s); - } - } - } - n = i; + add_number += S_GET_VALUE (fixP->fx_addsy); + add_number -= S_GET_VALUE (fixP->fx_subsy); + fixP->fx_offset = add_number; + fixP->fx_addsy = NULL; + fixP->fx_subsy = NULL; +#ifdef TC_M68K + /* See the comment below about 68k weirdness. */ + fixP->fx_pcrel = 0; #endif + } + else if (sub_symbol_segment == absolute_section + && !TC_FORCE_RELOCATION_SUB_ABS (fixP)) + { + add_number -= S_GET_VALUE (fixP->fx_subsy); + fixP->fx_offset = add_number; + fixP->fx_subsy = NULL; + } + else if (sub_symbol_segment == this_segment + && !TC_FORCE_RELOCATION_SUB_LOCAL (fixP)) + { + add_number -= S_GET_VALUE (fixP->fx_subsy); + fixP->fx_offset = (add_number + fixP->fx_dot_value + + fixP->fx_frag->fr_address); -#ifdef DEBUG4 - { - int i, j, nsyms; - asymbol **sympp; - sympp = bfd_get_outsymbols (stdoutput); - nsyms = bfd_get_symcount (stdoutput); - for (i = 0; i < n; i++) - if (((*relocs[i]->sym_ptr_ptr)->flags & BSF_SECTION_SYM) == 0) - { + /* Make it pc-relative. If the back-end code has not + selected a pc-relative reloc, cancel the adjustment + we do later on all pc-relative relocs. */ + if (0 +#ifdef TC_M68K + /* Do this for m68k even if it's already described + as pc-relative. On the m68k, an operand of + "pc@(foo-.-2)" should address "foo" in a + pc-relative mode. */ + || 1 +#endif + || !fixP->fx_pcrel) + add_number += MD_PCREL_FROM_SECTION (fixP, this_segment); + fixP->fx_subsy = NULL; + fixP->fx_pcrel = 1; + } + else if (!TC_VALIDATE_FIX_SUB (fixP)) + { + as_bad_where (fixP->fx_file, fixP->fx_line, + _("can't resolve `%s' {%s section} - `%s' {%s section}"), + fixP->fx_addsy ? S_GET_NAME (fixP->fx_addsy) : "0", + segment_name (add_symbol_segment), + S_GET_NAME (fixP->fx_subsy), + segment_name (sub_symbol_segment)); + } + } + + if (fixP->fx_addsy) + { + if (add_symbol_segment == this_segment + && !TC_FORCE_RELOCATION_LOCAL (fixP)) + { + /* This fixup was made when the symbol's segment was + SEG_UNKNOWN, but it is now in the local segment. + So we know how to do the address without relocation. */ + add_number += S_GET_VALUE (fixP->fx_addsy); + fixP->fx_offset = add_number; + if (fixP->fx_pcrel) + add_number -= MD_PCREL_FROM_SECTION (fixP, this_segment); + fixP->fx_addsy = NULL; + fixP->fx_pcrel = 0; + } + else if (add_symbol_segment == absolute_section + && !TC_FORCE_RELOCATION_ABS (fixP)) + { + add_number += S_GET_VALUE (fixP->fx_addsy); + fixP->fx_offset = add_number; + fixP->fx_addsy = NULL; + } + else if (add_symbol_segment != undefined_section + && ! bfd_is_com_section (add_symbol_segment) + && MD_APPLY_SYM_VALUE (fixP)) + add_number += S_GET_VALUE (fixP->fx_addsy); + } + + if (fixP->fx_pcrel) + { + add_number -= MD_PCREL_FROM_SECTION (fixP, this_segment); + if (!fixP->fx_done && fixP->fx_addsy == NULL) + { + /* There was no symbol required by this relocation. + However, BFD doesn't really handle relocations + without symbols well. So fake up a local symbol in + the absolute section. */ + fixP->fx_addsy = abs_section_sym; + } + } + + if (!fixP->fx_done) + md_apply_fix (fixP, &add_number, this_segment); + + if (!fixP->fx_done) + { + ++seg_reloc_count; + if (fixP->fx_addsy == NULL) + fixP->fx_addsy = abs_section_sym; + symbol_mark_used_in_reloc (fixP->fx_addsy); + if (fixP->fx_subsy != NULL) + symbol_mark_used_in_reloc (fixP->fx_subsy); + } + + if (!fixP->fx_bit_fixP && !fixP->fx_no_overflow && fixP->fx_size != 0) + { + if (fixP->fx_size < sizeof (valueT)) + { + valueT mask; + + mask = 0; + mask--; /* Set all bits to one. */ + mask <<= fixP->fx_size * 8 - (fixP->fx_signed ? 1 : 0); + if ((add_number & mask) != 0 && (add_number & mask) != mask) + { + char buf[50], buf2[50]; + sprint_value (buf, fragP->fr_address + fixP->fx_where); + if (add_number > 1000) + sprint_value (buf2, add_number); + else + sprintf (buf2, "%ld", (long) add_number); + as_bad_where (fixP->fx_file, fixP->fx_line, + _("value of %s too large for field of %d bytes at %s"), + buf2, fixP->fx_size, buf); + } /* Generic error checking. */ + } +#ifdef WARN_SIGNED_OVERFLOW_WORD + /* Warn if a .word value is too large when treated as a signed + number. We already know it is not too negative. This is to + catch over-large switches generated by gcc on the 68k. */ + if (!flag_signed_overflow_ok + && fixP->fx_size == 2 + && add_number > 0x7fff) + as_bad_where (fixP->fx_file, fixP->fx_line, + _("signed .word overflow; switch may be too large; %ld at 0x%lx"), + (long) add_number, + (long) (fragP->fr_address + fixP->fx_where)); +#endif + } /* Not a bit fix. */ + +#ifdef TC_VALIDATE_FIX + skip: ATTRIBUTE_UNUSED_LABEL + ; +#endif +#ifdef DEBUG5 + fprintf (stderr, "result:\n"); + print_fixup (fixP); +#endif + } /* For each fixS in this segment. */ + + TC_ADJUST_RELOC_COUNT (fixP, seg_reloc_count); + return seg_reloc_count; +} + +static void +fix_segment (bfd *abfd ATTRIBUTE_UNUSED, + asection *sec, + void *xxx ATTRIBUTE_UNUSED) +{ + segment_info_type *seginfo = seg_info (sec); + + fixup_segment (seginfo->fix_root, sec); +} + +static void +install_reloc (asection *sec, arelent *reloc, fragS *fragp, + char *file, unsigned int line) +{ + char *err; + bfd_reloc_status_type s; + + s = bfd_install_relocation (stdoutput, reloc, + fragp->fr_literal, fragp->fr_address, + sec, &err); + switch (s) + { + case bfd_reloc_ok: + break; + case bfd_reloc_overflow: + as_bad_where (file, line, _("relocation overflow")); + break; + case bfd_reloc_outofrange: + as_bad_where (file, line, _("relocation out of range")); + break; + default: + as_fatal (_("%s:%u: bad return from bfd_install_relocation: %x"), + file, line, s); + } +} + +static void +write_relocs (bfd *abfd, asection *sec, void *xxx ATTRIBUTE_UNUSED) +{ + segment_info_type *seginfo = seg_info (sec); + unsigned int i; + unsigned int n; + struct reloc_list *my_reloc_list, **rp, *r; + arelent **relocs; + fixS *fixp; + + /* If seginfo is NULL, we did not create this section; don't do + anything with it. */ + if (seginfo == NULL) + return; + + n = 0; + for (fixp = seginfo->fix_root; fixp; fixp = fixp->fx_next) + if (!fixp->fx_done) + n++; + +#ifdef RELOC_EXPANSION_POSSIBLE + n *= MAX_RELOC_EXPANSION; +#endif + + /* Extract relocs for this section from reloc_list. */ + rp = &reloc_list; + my_reloc_list = NULL; + while ((r = *rp) != NULL) + { + if (r->u.b.sec == sec) + { + *rp = r->next; + r->next = my_reloc_list; + my_reloc_list = r; + n++; + } + else + rp = &r->next; + } + + relocs = xcalloc (n, sizeof (arelent *)); + + i = 0; + for (fixp = seginfo->fix_root; fixp != (fixS *) NULL; fixp = fixp->fx_next) + { + int j; + int fx_size, slack; + offsetT loc; + + if (fixp->fx_done) + continue; + + fx_size = fixp->fx_size; + slack = TC_FX_SIZE_SLACK (fixp); + if (slack > 0) + fx_size = fx_size > slack ? fx_size - slack : 0; + loc = fixp->fx_where + fx_size; + if (slack >= 0 && loc > fixp->fx_frag->fr_fix) + as_bad_where (fixp->fx_file, fixp->fx_line, + _("internal error: fixup not contained within frag")); + +#ifndef RELOC_EXPANSION_POSSIBLE + { + arelent *reloc = tc_gen_reloc (sec, fixp); + + if (!reloc) + continue; + relocs[i++] = reloc; + j = 1; + } +#else + { + arelent **reloc = tc_gen_reloc (sec, fixp); + + for (j = 0; reloc[j]; j++) + relocs[i++] = reloc[j]; + } +#endif + + for ( ; j != 0; --j) + install_reloc (sec, relocs[i - j], fixp->fx_frag, + fixp->fx_file, fixp->fx_line); + } + n = i; + +#ifdef DEBUG4 + { + unsigned int i, j, nsyms; + asymbol **sympp; + sympp = bfd_get_outsymbols (stdoutput); + nsyms = bfd_get_symcount (stdoutput); + for (i = 0; i < n; i++) + if (((*relocs[i]->sym_ptr_ptr)->flags & BSF_SECTION_SYM) == 0) + { for (j = 0; j < nsyms; j++) if (sympp[j] == *relocs[i]->sym_ptr_ptr) break; @@ -1064,12 +1207,30 @@ write_relocs (bfd *abfd, asection *sec, PTR xxx ATTRIBUTE_UNUSED) } #endif + for (r = my_reloc_list; r != NULL; r = r->next) + { + fragS *f; + for (f = seginfo->frchainP->frch_root; f; f = f->fr_next) + if (f->fr_address <= r->u.b.r.address + && r->u.b.r.address < f->fr_address + f->fr_fix) + break; + if (f == NULL) + as_bad_where (r->file, r->line, + _("reloc not within (fixed part of) section")); + else + { + relocs[n++] = &r->u.b.r; + install_reloc (sec, &r->u.b.r, f, r->file, r->line); + } + } + if (n) - bfd_set_reloc (stdoutput, sec, relocs, n); - else - bfd_set_section_flags (abfd, sec, - (bfd_get_section_flags (abfd, sec) - & (flagword) ~SEC_RELOC)); + { + flagword flags = bfd_get_section_flags (abfd, sec); + flags |= SEC_RELOC; + bfd_set_section_flags (abfd, sec, flags); + bfd_set_reloc (stdoutput, sec, relocs, n); + } #ifdef SET_SECTION_RELOCS SET_SECTION_RELOCS (sec, relocs, n); @@ -1077,7 +1238,7 @@ write_relocs (bfd *abfd, asection *sec, PTR xxx ATTRIBUTE_UNUSED) #ifdef DEBUG3 { - int i; + unsigned int i; arelent *r; asymbol *s; fprintf (stderr, "relocs for sec %s\n", sec->name); @@ -1085,8 +1246,8 @@ write_relocs (bfd *abfd, asection *sec, PTR xxx ATTRIBUTE_UNUSED) { r = relocs[i]; s = *r->sym_ptr_ptr; - fprintf (stderr, " reloc %2d @%08x off %4x : sym %-10s addend %x\n", - i, r, r->address, s->name, r->addend); + fprintf (stderr, " reloc %2d @%p off %4lx : sym %-10s addend %lx\n", + i, r, (unsigned long)r->address, s->name, (unsigned long)r->addend); } } #endif @@ -1095,7 +1256,7 @@ write_relocs (bfd *abfd, asection *sec, PTR xxx ATTRIBUTE_UNUSED) static void write_contents (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, - PTR xxx ATTRIBUTE_UNUSED) + void *xxx ATTRIBUTE_UNUSED) { segment_info_type *seginfo = seg_info (sec); addressT offset = 0; @@ -1122,11 +1283,8 @@ write_contents (bfd *abfd ATTRIBUTE_UNUSED, f->fr_literal, (file_ptr) offset, (bfd_size_type) f->fr_fix); if (!x) - { - bfd_perror (stdoutput->filename); - as_perror (_("FATAL: Can't write %s"), stdoutput->filename); - exit (EXIT_FAILURE); - } + as_fatal (_("can't write %s: %s"), stdoutput->filename, + bfd_errmsg (bfd_get_error ())); offset += f->fr_fix; } fill_literal = f->fr_literal + f->fr_fix; @@ -1146,12 +1304,8 @@ write_contents (bfd *abfd ATTRIBUTE_UNUSED, (file_ptr) offset, (bfd_size_type) fill_size); if (!x) - { - bfd_perror (stdoutput->filename); - as_perror (_("FATAL: Can't write %s"), - stdoutput->filename); - exit (EXIT_FAILURE); - } + as_fatal (_("can't write %s: %s"), stdoutput->filename, + bfd_errmsg (bfd_get_error ())); offset += fill_size; } } @@ -1187,126 +1341,17 @@ write_contents (bfd *abfd ATTRIBUTE_UNUSED, } } } -#endif -#if defined(BFD_ASSEMBLER) || (!defined (BFD) && !defined(OBJ_AOUT)) static void merge_data_into_text (void) { -#if defined(BFD_ASSEMBLER) || defined(MANY_SEGMENTS) seg_info (text_section)->frchainP->frch_last->fr_next = seg_info (data_section)->frchainP->frch_root; seg_info (text_section)->frchainP->frch_last = seg_info (data_section)->frchainP->frch_last; seg_info (data_section)->frchainP = 0; -#else - fixS *tmp; - - text_last_frag->fr_next = data_frag_root; - text_last_frag = data_last_frag; - data_last_frag = NULL; - data_frag_root = NULL; - if (text_fix_root) - { - for (tmp = text_fix_root; tmp->fx_next; tmp = tmp->fx_next);; - tmp->fx_next = data_fix_root; - text_fix_tail = data_fix_tail; - } - else - text_fix_root = data_fix_root; - data_fix_root = NULL; -#endif } -#endif /* BFD_ASSEMBLER || (! BFD && ! OBJ_AOUT) */ -#if !defined (BFD_ASSEMBLER) && !defined (BFD) -static void -relax_and_size_all_segments () -{ - fragS *fragP; - - relax_segment (text_frag_root, SEG_TEXT); - relax_segment (data_frag_root, SEG_DATA); - relax_segment (bss_frag_root, SEG_BSS); - - /* Now the addresses of frags are correct within the segment. */ - know (text_last_frag->fr_type == rs_fill && text_last_frag->fr_offset == 0); - H_SET_TEXT_SIZE (&headers, text_last_frag->fr_address); - text_last_frag->fr_address = H_GET_TEXT_SIZE (&headers); - - /* Join the 2 segments into 1 huge segment. - To do this, re-compute every rn_address in the SEG_DATA frags. - Then join the data frags after the text frags. - - Determine a_data [length of data segment]. */ - if (data_frag_root) - { - register relax_addressT slide; - - know ((text_last_frag->fr_type == rs_fill) - && (text_last_frag->fr_offset == 0)); - - H_SET_DATA_SIZE (&headers, data_last_frag->fr_address); - data_last_frag->fr_address = H_GET_DATA_SIZE (&headers); - slide = H_GET_TEXT_SIZE (&headers); /* & in file of the data segment. */ -#ifdef OBJ_BOUT -#define RoundUp(N,S) (((N)+(S)-1)&-(S)) - /* For b.out: If the data section has a strict alignment - requirement, its load address in the .o file will be - rounded up from the size of the text section. These - two values are *not* the same! Similarly for the bss - section.... */ - slide = RoundUp (slide, 1 << section_alignment[SEG_DATA]); -#endif - - for (fragP = data_frag_root; fragP; fragP = fragP->fr_next) - fragP->fr_address += slide; - - know (text_last_frag != 0); - text_last_frag->fr_next = data_frag_root; - } - else - { - H_SET_DATA_SIZE (&headers, 0); - } - -#ifdef OBJ_BOUT - /* See above comments on b.out data section address. */ - { - addressT bss_vma; - if (data_last_frag == 0) - bss_vma = H_GET_TEXT_SIZE (&headers); - else - bss_vma = data_last_frag->fr_address; - bss_vma = RoundUp (bss_vma, 1 << section_alignment[SEG_BSS]); - bss_address_frag.fr_address = bss_vma; - } -#else /* ! OBJ_BOUT */ - bss_address_frag.fr_address = (H_GET_TEXT_SIZE (&headers) + - H_GET_DATA_SIZE (&headers)); - -#endif /* ! OBJ_BOUT */ - - /* Slide all the frags. */ - if (bss_frag_root) - { - relax_addressT slide = bss_address_frag.fr_address; - - for (fragP = bss_frag_root; fragP; fragP = fragP->fr_next) - fragP->fr_address += slide; - } - - if (bss_last_frag) - H_SET_BSS_SIZE (&headers, - bss_last_frag->fr_address - bss_frag_root->fr_address); - else - H_SET_BSS_SIZE (&headers, 0); -} -#endif /* ! BFD_ASSEMBLER && ! BFD */ - -#if defined (BFD_ASSEMBLER) || !defined (BFD) - -#ifdef BFD_ASSEMBLER static void set_symtab (void) { @@ -1314,7 +1359,6 @@ set_symtab (void) asymbol **asympp; symbolS *symp; bfd_boolean result; - extern PTR bfd_alloc (bfd *, bfd_size_type); /* Count symbols. We can't rely on a count made by the loop in write_object_file, because *_frob_file may add a new symbol or @@ -1328,7 +1372,7 @@ set_symtab (void) int i; bfd_size_type amt = (bfd_size_type) nsyms * sizeof (asymbol *); - asympp = (asymbol **) bfd_alloc (stdoutput, amt); + asympp = bfd_alloc (stdoutput, amt); symp = symbol_rootP; for (i = 0; i < nsyms; i++, symp = symbol_next (symp)) { @@ -1342,7 +1386,6 @@ set_symtab (void) assert (result); symbol_table_frozen = 1; } -#endif /* Finish the subsegments. After every sub-segment, we fake an ".align ...". This conforms to BSD4.2 brane-damage. We then fake @@ -1356,14 +1399,9 @@ set_symtab (void) of the section. This allows proper nop-filling at the end of code-bearing sections. */ #define SUB_SEGMENT_ALIGN(SEG, FRCHAIN) \ - (!(FRCHAIN)->frch_next || (FRCHAIN)->frch_next->frch_seg != (SEG) \ - ? get_recorded_alignment (SEG) : 0) + (!(FRCHAIN)->frch_next ? get_recorded_alignment (SEG) : 0) #else -#ifdef BFD_ASSEMBLER #define SUB_SEGMENT_ALIGN(SEG, FRCHAIN) 0 -#else -#define SUB_SEGMENT_ALIGN(SEG, FRCHAIN) 2 -#endif #endif #endif @@ -1371,50 +1409,58 @@ void subsegs_finish (void) { struct frchain *frchainP; + asection *s; - for (frchainP = frchain_root; frchainP; frchainP = frchainP->frch_next) + for (s = stdoutput->sections; s; s = s->next) { - int alignment = 0; + segment_info_type *seginfo = seg_info (s); + if (!seginfo) + continue; - subseg_set (frchainP->frch_seg, frchainP->frch_subseg); - - /* This now gets called even if we had errors. In that case, - any alignment is meaningless, and, moreover, will look weird - if we are generating a listing. */ - if (!had_errors ()) + for (frchainP = seginfo->frchainP; + frchainP != NULL; + frchainP = frchainP->frch_next) { - alignment = SUB_SEGMENT_ALIGN (now_seg, frchainP); -#ifdef BFD_ASSEMBLER - if ((bfd_get_section_flags (now_seg->owner, now_seg) & SEC_MERGE) - && now_seg->entsize) - { - unsigned int entsize = now_seg->entsize; - int entalign = 0; + int alignment = 0; - while ((entsize & 1) == 0) + subseg_set (s, frchainP->frch_subseg); + + /* This now gets called even if we had errors. In that case, + any alignment is meaningless, and, moreover, will look weird + if we are generating a listing. */ + if (!had_errors ()) + { + alignment = SUB_SEGMENT_ALIGN (now_seg, frchainP); + if ((bfd_get_section_flags (now_seg->owner, now_seg) & SEC_MERGE) + && now_seg->entsize) { - ++entalign; - entsize >>= 1; + unsigned int entsize = now_seg->entsize; + int entalign = 0; + + while ((entsize & 1) == 0) + { + ++entalign; + entsize >>= 1; + } + if (entalign > alignment) + alignment = entalign; } - if (entalign > alignment) - alignment = entalign; } -#endif - } - if (subseg_text_p (now_seg)) - frag_align_code (alignment, 0); - else - frag_align (alignment, 0, 0); + if (subseg_text_p (now_seg)) + frag_align_code (alignment, 0); + else + frag_align (alignment, 0, 0); - /* frag_align will have left a new frag. - Use this last frag for an empty ".fill". + /* frag_align will have left a new frag. + Use this last frag for an empty ".fill". - For this segment ... - Create a last frag. Do not leave a "being filled in frag". */ - frag_wane (frag_now); - frag_now->fr_fix = 0; - know (frag_now->fr_next == NULL); + For this segment ... + Create a last frag. Do not leave a "being filled in frag". */ + frag_wane (frag_now); + frag_now->fr_fix = 0; + know (frag_now->fr_next == NULL); + } } } @@ -1423,7 +1469,8 @@ subsegs_finish (void) void write_object_file (void) { -#if ! defined (BFD_ASSEMBLER) || ! defined (WORKING_DOT_WORD) + struct relax_seg_info rsi; +#ifndef WORKING_DOT_WORD fragS *fragP; /* Track along all frags. */ #endif @@ -1460,49 +1507,30 @@ write_object_file (void) /* From now on, we don't care about sub-segments. Build one frag chain for each segment. Linked thru fr_next. */ -#ifdef BFD_ASSEMBLER /* Remove the sections created by gas for its own purposes. */ { - asection **seclist; int i; - seclist = &stdoutput->sections; - while (*seclist) - { - if (*seclist == reg_section || *seclist == expr_section) - { - bfd_section_list_remove (stdoutput, seclist); - stdoutput->section_count--; - } - else - seclist = &(*seclist)->next; - } + bfd_section_list_remove (stdoutput, reg_section); + bfd_section_list_remove (stdoutput, expr_section); + stdoutput->section_count -= 2; i = 0; bfd_map_over_sections (stdoutput, renumber_sections, &i); } bfd_map_over_sections (stdoutput, chain_frchains_together, (char *) 0); -#else - remove_subsegs (frchain_root, SEG_TEXT, &text_frag_root, &text_last_frag); - remove_subsegs (data0_frchainP, SEG_DATA, &data_frag_root, &data_last_frag); - remove_subsegs (bss0_frchainP, SEG_BSS, &bss_frag_root, &bss_last_frag); -#endif /* We have two segments. If user gave -R flag, then we must put the data frags into the text segment. Do this before relaxing so we know to take advantage of -R and make shorter addresses. */ -#if !defined (OBJ_AOUT) || defined (BFD_ASSEMBLER) if (flag_readonly_data_in_text) { merge_data_into_text (); } -#endif -#ifdef BFD_ASSEMBLER + rsi.pass = 0; while (1) { - int changed; - #ifndef WORKING_DOT_WORD /* We need to reset the markers in the broken word list and associated frags between calls to relax_segment (via @@ -1523,9 +1551,10 @@ write_object_file (void) } #endif - changed = 0; - bfd_map_over_sections (stdoutput, relax_seg, &changed); - if (!changed) + rsi.changed = 0; + bfd_map_over_sections (stdoutput, relax_seg, &rsi); + rsi.pass++; + if (!rsi.changed) break; } @@ -1539,9 +1568,6 @@ write_object_file (void) finalize_syms = TC_FINALIZE_SYMS_BEFORE_SIZE_SEG; bfd_map_over_sections (stdoutput, size_seg, (char *) 0); -#else - relax_and_size_all_segments (); -#endif /* BFD_ASSEMBLER */ /* Relaxation has completed. Freeze all syms. */ finalize_syms = 1; @@ -1550,64 +1576,6 @@ write_object_file (void) md_post_relax_hook; #endif -#ifndef BFD_ASSEMBLER - /* Crawl the symbol chain. - - For each symbol whose value depends on a frag, take the address of - that frag and subsume it into the value of the symbol. - After this, there is just one way to lookup a symbol value. - Values are left in their final state for object file emission. - We adjust the values of 'L' local symbols, even if we do - not intend to emit them to the object file, because their values - are needed for fix-ups. - - Unless we saw a -L flag, remove all symbols that begin with 'L' - from the symbol chain. (They are still pointed to by the fixes.) - - Count the remaining symbols. - Assign a symbol number to each symbol. - Count the number of string-table chars we will emit. - Put this info into the headers as appropriate. */ - know (zero_address_frag.fr_address == 0); - string_byte_count = 4; - - obj_crawl_symbol_chain (&headers); - - if (string_byte_count == 4) - string_byte_count = 0; - - H_SET_STRING_SIZE (&headers, string_byte_count); - - /* Addresses of frags now reflect addresses we use in the object file. - Symbol values are correct. - Scan the frags, converting any ".org"s and ".align"s to ".fill"s. - Also converting any machine-dependent frags using md_convert_frag(); */ - subseg_change (SEG_TEXT, 0); - - for (fragP = text_frag_root; fragP; fragP = fragP->fr_next) - { - /* At this point we have linked all the frags into a single - chain. However, cvt_frag_to_fill may call md_convert_frag - which may call fix_new. We need to ensure that fix_new adds - the fixup to the right section. */ - if (fragP == data_frag_root) - subseg_change (SEG_DATA, 0); - - cvt_frag_to_fill (&headers, SEG_TEXT, fragP); - - /* Some assert macros don't work with # directives mixed in. */ -#ifndef NDEBUG - if (!(fragP->fr_next == NULL -#ifdef OBJ_BOUT - || fragP->fr_next == data_frag_root -#endif - || ((offsetT) (fragP->fr_next->fr_address - fragP->fr_address) - == (fragP->fr_fix + fragP->fr_offset * fragP->fr_var)))) - abort (); -#endif - } -#endif /* ! BFD_ASSEMBLER */ - #ifndef WORKING_DOT_WORD { struct broken_word *lie; @@ -1624,7 +1592,6 @@ write_object_file (void) exp.X_add_symbol = lie->add; exp.X_op_symbol = lie->sub; exp.X_add_number = lie->addnum; -#ifdef BFD_ASSEMBLER #ifdef TC_CONS_FIX_NEW TC_CONS_FIX_NEW (lie->frag, lie->word_goes_here - lie->frag->fr_literal, @@ -1634,23 +1601,6 @@ write_object_file (void) lie->word_goes_here - lie->frag->fr_literal, 2, &exp, 0, BFD_RELOC_16); #endif -#else -#if defined(TC_SPARC) || defined(TC_A29K) || defined(NEED_FX_R_TYPE) - fix_new_exp (lie->frag, - lie->word_goes_here - lie->frag->fr_literal, - 2, &exp, 0, NO_RELOC); -#else -#ifdef TC_NS32K - fix_new_ns32k_exp (lie->frag, - lie->word_goes_here - lie->frag->fr_literal, - 2, &exp, 0, 0, 2, 0, 0); -#else - fix_new_exp (lie->frag, - lie->word_goes_here - lie->frag->fr_literal, - 2, &exp, 0, 0); -#endif /* TC_NS32K */ -#endif /* TC_SPARC|TC_A29K|NEED_FX_R_TYPE */ -#endif /* BFD_ASSEMBLER */ *prevP = lie->next_broken_word; } else @@ -1721,132 +1671,6 @@ write_object_file (void) } #endif /* not WORKING_DOT_WORD */ -#ifndef BFD_ASSEMBLER -#ifndef OBJ_VMS - { /* not vms */ - char *the_object_file; - long object_file_size; - /* Scan every FixS performing fixups. We had to wait until now to - do this because md_convert_frag() may have made some fixSs. */ - int trsize, drsize; - - subseg_change (SEG_TEXT, 0); - trsize = md_reloc_size * fixup_segment (text_fix_root, SEG_TEXT); - subseg_change (SEG_DATA, 0); - drsize = md_reloc_size * fixup_segment (data_fix_root, SEG_DATA); - H_SET_RELOCATION_SIZE (&headers, trsize, drsize); - - /* FIXME: Move this stuff into the pre-write-hook. */ - H_SET_MAGIC_NUMBER (&headers, magic_number_for_object_file); - H_SET_ENTRY_POINT (&headers, 0); - - obj_pre_write_hook (&headers); /* Extra coff stuff. */ - - object_file_size = H_GET_FILE_SIZE (&headers); - next_object_file_charP = the_object_file = xmalloc (object_file_size); - - output_file_create (out_file_name); - - obj_header_append (&next_object_file_charP, &headers); - - know ((next_object_file_charP - the_object_file) - == H_GET_HEADER_SIZE (&headers)); - - /* Emit code. */ - for (fragP = text_frag_root; fragP; fragP = fragP->fr_next) - { - register long count; - register char *fill_literal; - register long fill_size; - - PROGRESS (1); - know (fragP->fr_type == rs_fill); - append (&next_object_file_charP, fragP->fr_literal, - (unsigned long) fragP->fr_fix); - fill_literal = fragP->fr_literal + fragP->fr_fix; - fill_size = fragP->fr_var; - know (fragP->fr_offset >= 0); - - for (count = fragP->fr_offset; count; count--) - append (&next_object_file_charP, fill_literal, - (unsigned long) fill_size); - } - - know ((next_object_file_charP - the_object_file) - == (H_GET_HEADER_SIZE (&headers) - + H_GET_TEXT_SIZE (&headers) - + H_GET_DATA_SIZE (&headers))); - - /* Emit relocations. */ - obj_emit_relocations (&next_object_file_charP, text_fix_root, - (relax_addressT) 0); - know ((next_object_file_charP - the_object_file) - == (H_GET_HEADER_SIZE (&headers) - + H_GET_TEXT_SIZE (&headers) - + H_GET_DATA_SIZE (&headers) - + H_GET_TEXT_RELOCATION_SIZE (&headers))); -#ifdef TC_I960 - /* Make addresses in data relocation directives relative to beginning of - first data fragment, not end of last text fragment: alignment of the - start of the data segment may place a gap between the segments. */ - obj_emit_relocations (&next_object_file_charP, data_fix_root, - data0_frchainP->frch_root->fr_address); -#else /* TC_I960 */ - obj_emit_relocations (&next_object_file_charP, data_fix_root, - text_last_frag->fr_address); -#endif /* TC_I960 */ - - know ((next_object_file_charP - the_object_file) - == (H_GET_HEADER_SIZE (&headers) - + H_GET_TEXT_SIZE (&headers) - + H_GET_DATA_SIZE (&headers) - + H_GET_TEXT_RELOCATION_SIZE (&headers) - + H_GET_DATA_RELOCATION_SIZE (&headers))); - - /* Emit line number entries. */ - OBJ_EMIT_LINENO (&next_object_file_charP, lineno_rootP, the_object_file); - know ((next_object_file_charP - the_object_file) - == (H_GET_HEADER_SIZE (&headers) - + H_GET_TEXT_SIZE (&headers) - + H_GET_DATA_SIZE (&headers) - + H_GET_TEXT_RELOCATION_SIZE (&headers) - + H_GET_DATA_RELOCATION_SIZE (&headers) - + H_GET_LINENO_SIZE (&headers))); - - /* Emit symbols. */ - obj_emit_symbols (&next_object_file_charP, symbol_rootP); - know ((next_object_file_charP - the_object_file) - == (H_GET_HEADER_SIZE (&headers) - + H_GET_TEXT_SIZE (&headers) - + H_GET_DATA_SIZE (&headers) - + H_GET_TEXT_RELOCATION_SIZE (&headers) - + H_GET_DATA_RELOCATION_SIZE (&headers) - + H_GET_LINENO_SIZE (&headers) - + H_GET_SYMBOL_TABLE_SIZE (&headers))); - - /* Emit strings. */ - if (string_byte_count > 0) - obj_emit_strings (&next_object_file_charP); - -#ifdef BFD_HEADERS - bfd_seek (stdoutput, (file_ptr) 0, 0); - bfd_bwrite (the_object_file, (bfd_size_type) object_file_size, stdoutput); -#else - - /* Write the data to the file. */ - output_file_append (the_object_file, object_file_size, out_file_name); - free (the_object_file); -#endif - } -#else /* OBJ_VMS */ - /* Now do the VMS-dependent part of writing the object file. */ - vms_write_object_file (H_GET_TEXT_SIZE (&headers), - H_GET_DATA_SIZE (&headers), - H_GET_BSS_SIZE (&headers), - text_frag_root, data_frag_root); -#endif /* OBJ_VMS */ -#else /* BFD_ASSEMBLER */ - /* Resolve symbol values. This needs to be done before processing the relocations. */ if (symbol_rootP) @@ -1857,6 +1681,7 @@ write_object_file (void) resolve_symbol_value (symp); } resolve_local_symbol_values (); + resolve_reloc_expr_symbols (); PROGRESS (1); @@ -1924,22 +1749,24 @@ write_object_file (void) resolve_symbol_value (symp); /* Skip symbols which were equated to undefined or common - symbols. */ - if (symbol_equated_reloc_p (symp)) + symbols. */ + if (symbol_equated_reloc_p (symp) + || S_IS_WEAKREFR (symp)) { - if (S_IS_COMMON (symp)) - as_bad (_("`%s' can't be equated to common symbol"), - S_GET_NAME (symp)); + const char *name = S_GET_NAME (symp); + if (S_IS_COMMON (symp) + && !TC_FAKE_LABEL (name) + && !S_IS_WEAKREFR (symp) + && (!S_IS_EXTERNAL (symp) || S_IS_LOCAL (symp))) + { + expressionS *e = symbol_get_value_expression (symp); + as_bad (_("Local symbol `%s' can't be equated to common symbol `%s'"), + name, S_GET_NAME (e->X_add_symbol)); + } symbol_remove (symp, &symbol_rootP, &symbol_lastP); continue; } - /* So far, common symbols have been treated like undefined symbols. - Put them in the common section now. */ - if (S_IS_DEFINED (symp) == 0 - && S_GET_VALUE (symp) != 0) - S_SET_SEGMENT (symp, bfd_com_section_ptr); - #ifdef obj_frob_symbol obj_frob_symbol (symp, punt); #endif @@ -1956,11 +1783,12 @@ write_object_file (void) if (symp == abs_section_sym || (! EMIT_SECTION_SYMBOLS && symbol_section_p (symp)) - /* Note that S_IS_EXTERN and S_IS_LOCAL are not always + /* Note that S_IS_EXTERNAL and S_IS_LOCAL are not always opposites. Sometimes the former checks flags and the latter examines the name... */ - || (!S_IS_EXTERN (symp) - && (punt || S_IS_LOCAL (symp)) + || (!S_IS_EXTERNAL (symp) + && (punt || S_IS_LOCAL (symp) || + (S_IS_WEAKREFD (symp) && ! symbol_used_p (symp))) && ! symbol_used_in_reloc_p (symp))) { symbol_remove (symp, &symbol_rootP, &symbol_lastP); @@ -2027,12 +1855,9 @@ write_object_file (void) #endif bfd_map_over_sections (stdoutput, write_contents, (char *) 0); -#endif /* BFD_ASSEMBLER */ } -#endif /* ! BFD */ #ifdef TC_GENERIC_RELAX_TABLE - /* Relax a fragment by scanning TC_GENERIC_RELAX_TABLE. */ long @@ -2063,12 +1888,6 @@ relax_frag (segT segment, fragS *fragP, long stretch) sym_frag = symbol_get_frag (symbolP); #ifndef DIFF_EXPR_OK -#if !defined (MANY_SEGMENTS) && !defined (BFD_ASSEMBLER) - know ((S_GET_SEGMENT (symbolP) == SEG_ABSOLUTE) - || (S_GET_SEGMENT (symbolP) == SEG_DATA) - || (S_GET_SEGMENT (symbolP) == SEG_BSS) - || (S_GET_SEGMENT (symbolP) == SEG_TEXT)); -#endif know (sym_frag != NULL); #endif know (S_GET_SEGMENT (symbolP) != absolute_section @@ -2167,22 +1986,22 @@ relax_align (register relax_addressT address, /* Address now. */ addresses. */ int -relax_segment (struct frag *segment_frag_root, segT segment) +relax_segment (struct frag *segment_frag_root, segT segment, int pass) { - register struct frag *fragP; - register relax_addressT address; + unsigned long frag_count; + struct frag *fragP; + relax_addressT address; int ret; -#if !defined (MANY_SEGMENTS) && !defined (BFD_ASSEMBLER) - know (segment == SEG_DATA || segment == SEG_TEXT || segment == SEG_BSS); -#endif /* In case md_estimate_size_before_relax() wants to make fixSs. */ subseg_change (segment, 0); /* For each frag in segment: count and store (a 1st guess of) fr_address. */ address = 0; - for (fragP = segment_frag_root; fragP; fragP = fragP->fr_next) + for (frag_count = 0, fragP = segment_frag_root; + fragP; + fragP = fragP->fr_next, frag_count ++) { fragP->relax_marker = 0; fragP->fr_address = address; @@ -2258,14 +2077,55 @@ relax_segment (struct frag *segment_frag_root, segT segment) /* Do relax(). */ { - offsetT stretch; /* May be any size, 0 or negative. */ - /* Cumulative number of addresses we have relaxed this pass. - We may have relaxed more than one address. */ - int stretched; /* Have we stretched on this pass? */ - /* This is 'cuz stretch may be zero, when, in fact some piece of code - grew, and another shrank. If a branch instruction doesn't fit anymore, - we could be scrod. */ - + unsigned long max_iterations; + + /* Cumulative address adjustment. */ + offsetT stretch; + + /* Have we made any adjustment this pass? We can't just test + stretch because one piece of code may have grown and another + shrank. */ + int stretched; + + /* Most horrible, but gcc may give us some exception data that + is impossible to assemble, of the form + + .align 4 + .byte 0, 0 + .uleb128 end - start + start: + .space 128*128 - 1 + .align 4 + end: + + If the leb128 is two bytes in size, then end-start is 128*128, + which requires a three byte leb128. If the leb128 is three + bytes in size, then end-start is 128*128-1, which requires a + two byte leb128. We work around this dilemma by inserting + an extra 4 bytes of alignment just after the .align. This + works because the data after the align is accessed relative to + the end label. + + This counter is used in a tiny state machine to detect + whether a leb128 followed by an align is impossible to + relax. */ + int rs_leb128_fudge = 0; + + /* We want to prevent going into an infinite loop where one frag grows + depending upon the location of a symbol which is in turn moved by + the growing frag. eg: + + foo = . + .org foo+16 + foo = . + + So we dictate that this algorithm can be at most O2. */ + max_iterations = frag_count * frag_count; + /* Check for overflow. */ + if (max_iterations < frag_count) + max_iterations = frag_count; + + ret = 0; do { stretch = 0; @@ -2370,8 +2230,51 @@ relax_segment (struct frag *segment_frag_root, segT segment) if (newoff > fragP->fr_subtype) newoff = 0; } - - growth = newoff - oldoff; + + growth = newoff - oldoff; + + /* If this align happens to follow a leb128 and + we have determined that the leb128 is bouncing + in size, then break the cycle by inserting an + extra alignment. */ + if (growth < 0 + && (rs_leb128_fudge & 16) != 0 + && (rs_leb128_fudge & 15) >= 2) + { + segment_info_type *seginfo = seg_info (segment); + struct obstack *ob = &seginfo->frchainP->frch_obstack; + struct frag *newf; + + newf = frag_alloc (ob); + obstack_blank_fast (ob, fragP->fr_var); + obstack_finish (ob); + memcpy (newf, fragP, SIZEOF_STRUCT_FRAG); + memcpy (newf->fr_literal, + fragP->fr_literal + fragP->fr_fix, + fragP->fr_var); + newf->fr_type = rs_fill; + newf->fr_fix = 0; + newf->fr_offset = (((offsetT) 1 << fragP->fr_offset) + / fragP->fr_var); + if (newf->fr_offset * newf->fr_var + != (offsetT) 1 << fragP->fr_offset) + { + newf->fr_offset = (offsetT) 1 << fragP->fr_offset; + newf->fr_var = 1; + } + /* Include growth of new frag, because rs_fill + frags don't normally grow. */ + growth += newf->fr_offset * newf->fr_var; + /* The new frag address is newoff. Adjust this + for the amount we'll add when we process the + new frag. */ + newf->fr_address = newoff - stretch - growth; + newf->relax_marker ^= 1; + fragP->fr_next = newf; +#ifdef DEBUG + as_warn (_("padding added")); +#endif + } } break; @@ -2382,22 +2285,11 @@ relax_segment (struct frag *segment_frag_root, segT segment) if (symbolP) { -#if !defined (MANY_SEGMENTS) && !defined (BFD_ASSEMBLER) - know ((S_GET_SEGMENT (symbolP) == SEG_ABSOLUTE) - || (S_GET_SEGMENT (symbolP) == SEG_DATA) - || (S_GET_SEGMENT (symbolP) == SEG_TEXT) - || S_GET_SEGMENT (symbolP) == SEG_BSS); - know (symbolP->sy_frag); - know (!(S_GET_SEGMENT (symbolP) == SEG_ABSOLUTE) - || (symbolP->sy_frag == &zero_address_frag)); -#endif - /* Convert from an actual address to an octet offset - into the section. Here it is assumed that the - section's VMA is zero, and can omit subtracting it - from the symbol's value to get the address offset. */ -#ifdef BFD_ASSEMBLER - know (S_GET_SEGMENT (symbolP)->vma == 0); -#endif + /* Convert from an actual address to an octet offset + into the section. Here it is assumed that the + section's VMA is zero, and can omit subtracting it + from the symbol's value to get the address offset. */ + know (S_GET_SEGMENT (symbolP)->vma == 0); target += S_GET_VALUE (symbolP) * OCTETS_PER_BYTE; } @@ -2406,6 +2298,26 @@ relax_segment (struct frag *segment_frag_root, segT segment) growth = target - after; if (growth < 0) { + growth = 0; + + /* Don't error on first few frag relax passes. + The symbol might be an expression involving + symbol values from other sections. If those + sections have not yet been processed their + frags will all have zero addresses, so we + will calculate incorrect values for them. The + number of passes we allow before giving an + error is somewhat arbitrary. It should be at + least one, with larger values requiring + increasingly contrived dependencies between + frags to trigger a false error. */ + if (pass < 2) + { + /* Force another pass. */ + ret = 1; + break; + } + /* Growth may be negative, but variable part of frag cannot have fewer than 0 chars. That is, we can't .org backwards. */ @@ -2413,12 +2325,12 @@ relax_segment (struct frag *segment_frag_root, segT segment) _("attempt to move .org backwards")); /* We've issued an error message. Change the - frag to avoid cascading errors. */ + frag to avoid cascading errors. */ fragP->fr_type = rs_align; fragP->fr_subtype = 0; fragP->fr_offset = 0; fragP->fr_fix = after - was_address; - growth = stretch; + break; } /* This is an absolute growth factor */ @@ -2444,6 +2356,14 @@ relax_segment (struct frag *segment_frag_root, segT segment) } else if (amount < 0) { + /* Don't error on first few frag relax passes. + See rs_org comment for a longer explanation. */ + if (pass < 2) + { + ret = 1; + break; + } + as_warn_where (fragP->fr_file, fragP->fr_line, _(".space or .fill with negative value, ignored")); fragP->fr_symbol = 0; @@ -2494,13 +2414,32 @@ relax_segment (struct frag *segment_frag_root, segT segment) { stretch += growth; stretched = 1; + if (fragP->fr_type == rs_leb128) + rs_leb128_fudge += 16; + else if (fragP->fr_type == rs_align + && (rs_leb128_fudge & 16) != 0 + && stretch == 0) + rs_leb128_fudge += 16; + else + rs_leb128_fudge = 0; } - } /* For each frag in the segment. */ + } + + if (stretch == 0 + && (rs_leb128_fudge & 16) == 0 + && (rs_leb128_fudge & -16) != 0) + rs_leb128_fudge += 1; + else + rs_leb128_fudge = 0; } - while (stretched); /* Until nothing further to relax. */ - } /* do_relax */ + /* Until nothing further to relax. */ + while (stretched && -- max_iterations); + + if (stretched) + as_fatal (_("Infinite loop encountered whilst attempting to compute the addresses of symbols in section %s"), + segment_name (segment)); + } - ret = 0; for (fragP = segment_frag_root; fragP; fragP = fragP->fr_next) if (fragP->last_fr_address != fragP->fr_address) { @@ -2510,258 +2449,6 @@ relax_segment (struct frag *segment_frag_root, segT segment) return ret; } -#if defined (BFD_ASSEMBLER) || (!defined (BFD) && !defined (OBJ_VMS)) - -/* fixup_segment() - - Go through all the fixS's in a segment and see which ones can be - handled now. (These consist of fixS where we have since discovered - the value of a symbol, or the address of the frag involved.) - For each one, call md_apply_fix3 to put the fix into the frag data. - - Result is a count of how many relocation structs will be needed to - handle the remaining fixS's that we couldn't completely handle here. - These will be output later by emit_relocations(). */ - -static long -fixup_segment (fixS *fixP, segT this_segment) -{ - long seg_reloc_count = 0; - valueT add_number; - fragS *fragP; - segT add_symbol_segment = absolute_section; - - if (fixP != NULL && abs_section_sym == NULL) - { -#ifndef BFD_ASSEMBLER - abs_section_sym = &abs_symbol; -#else - abs_section_sym = section_symbol (absolute_section); -#endif - } - - /* If the linker is doing the relaxing, we must not do any fixups. - - Well, strictly speaking that's not true -- we could do any that - are PC-relative and don't cross regions that could change size. - And for the i960 we might be able to turn callx/callj into bal - anyways in cases where we know the maximum displacement. */ - if (linkrelax && TC_LINKRELAX_FIXUP (this_segment)) - { - for (; fixP; fixP = fixP->fx_next) - if (!fixP->fx_done) - { - if (fixP->fx_addsy == NULL) - { - /* There was no symbol required by this relocation. - However, BFD doesn't really handle relocations - without symbols well. So fake up a local symbol in - the absolute section. */ - fixP->fx_addsy = abs_section_sym; - } - symbol_mark_used_in_reloc (fixP->fx_addsy); - if (fixP->fx_subsy != NULL) - symbol_mark_used_in_reloc (fixP->fx_subsy); - seg_reloc_count++; - } - TC_ADJUST_RELOC_COUNT (fixP, seg_reloc_count); - return seg_reloc_count; - } - - for (; fixP; fixP = fixP->fx_next) - { -#ifdef DEBUG5 - fprintf (stderr, "\nprocessing fixup:\n"); - print_fixup (fixP); -#endif - - fragP = fixP->fx_frag; - know (fragP); -#ifdef TC_VALIDATE_FIX - TC_VALIDATE_FIX (fixP, this_segment, skip); -#endif - add_number = fixP->fx_offset; - - if (fixP->fx_addsy != NULL - && symbol_mri_common_p (fixP->fx_addsy)) - { - add_number += S_GET_VALUE (fixP->fx_addsy); - fixP->fx_offset = add_number; - fixP->fx_addsy - = symbol_get_value_expression (fixP->fx_addsy)->X_add_symbol; - } - - if (fixP->fx_addsy != NULL) - add_symbol_segment = S_GET_SEGMENT (fixP->fx_addsy); - - if (fixP->fx_subsy != NULL) - { - segT sub_symbol_segment; - resolve_symbol_value (fixP->fx_subsy); - sub_symbol_segment = S_GET_SEGMENT (fixP->fx_subsy); - if (fixP->fx_addsy != NULL - && sub_symbol_segment == add_symbol_segment - && !TC_FORCE_RELOCATION_SUB_SAME (fixP, add_symbol_segment)) - { - add_number += S_GET_VALUE (fixP->fx_addsy); - add_number -= S_GET_VALUE (fixP->fx_subsy); - fixP->fx_offset = add_number; - fixP->fx_addsy = NULL; - fixP->fx_subsy = NULL; -#ifdef TC_M68K - /* See the comment below about 68k weirdness. */ - fixP->fx_pcrel = 0; -#endif - } - else if (sub_symbol_segment == absolute_section - && !TC_FORCE_RELOCATION_SUB_ABS (fixP)) - { - add_number -= S_GET_VALUE (fixP->fx_subsy); - fixP->fx_offset = add_number; - fixP->fx_subsy = NULL; - } - else if (sub_symbol_segment == this_segment - && !TC_FORCE_RELOCATION_SUB_LOCAL (fixP)) - { - add_number -= S_GET_VALUE (fixP->fx_subsy); - fixP->fx_offset = (add_number + fixP->fx_dot_value - + fixP->fx_frag->fr_address); - - /* Make it pc-relative. If the back-end code has not - selected a pc-relative reloc, cancel the adjustment - we do later on all pc-relative relocs. */ - if (0 -#ifdef TC_M68K - /* Do this for m68k even if it's already described - as pc-relative. On the m68k, an operand of - "pc@(foo-.-2)" should address "foo" in a - pc-relative mode. */ - || 1 -#endif - || !fixP->fx_pcrel) - add_number += MD_PCREL_FROM_SECTION (fixP, this_segment); - fixP->fx_subsy = NULL; - fixP->fx_pcrel = 1; - } - else if (!TC_VALIDATE_FIX_SUB (fixP)) - { - as_bad_where (fixP->fx_file, fixP->fx_line, - _("can't resolve `%s' {%s section} - `%s' {%s section}"), - fixP->fx_addsy ? S_GET_NAME (fixP->fx_addsy) : "0", - segment_name (add_symbol_segment), - S_GET_NAME (fixP->fx_subsy), - segment_name (sub_symbol_segment)); - } - } - - if (fixP->fx_addsy) - { - if (add_symbol_segment == this_segment - && !TC_FORCE_RELOCATION_LOCAL (fixP)) - { - /* This fixup was made when the symbol's segment was - SEG_UNKNOWN, but it is now in the local segment. - So we know how to do the address without relocation. */ - add_number += S_GET_VALUE (fixP->fx_addsy); - fixP->fx_offset = add_number; - if (fixP->fx_pcrel) - add_number -= MD_PCREL_FROM_SECTION (fixP, this_segment); - fixP->fx_addsy = NULL; - fixP->fx_pcrel = 0; - } - else if (add_symbol_segment == absolute_section - && !TC_FORCE_RELOCATION_ABS (fixP)) - { - add_number += S_GET_VALUE (fixP->fx_addsy); - fixP->fx_offset = add_number; - fixP->fx_addsy = NULL; - } - else if (add_symbol_segment != undefined_section -#ifdef BFD_ASSEMBLER - && ! bfd_is_com_section (add_symbol_segment) -#endif - && MD_APPLY_SYM_VALUE (fixP)) - add_number += S_GET_VALUE (fixP->fx_addsy); - } - - if (fixP->fx_pcrel) - { - add_number -= MD_PCREL_FROM_SECTION (fixP, this_segment); - if (!fixP->fx_done && fixP->fx_addsy == NULL) - { - /* There was no symbol required by this relocation. - However, BFD doesn't really handle relocations - without symbols well. So fake up a local symbol in - the absolute section. */ - fixP->fx_addsy = abs_section_sym; - } - } - - if (!fixP->fx_done) - md_apply_fix3 (fixP, &add_number, this_segment); - - if (!fixP->fx_done) - { - ++seg_reloc_count; - if (fixP->fx_addsy == NULL) - fixP->fx_addsy = abs_section_sym; - symbol_mark_used_in_reloc (fixP->fx_addsy); - if (fixP->fx_subsy != NULL) - symbol_mark_used_in_reloc (fixP->fx_subsy); - } - - if (!fixP->fx_bit_fixP && !fixP->fx_no_overflow && fixP->fx_size != 0) - { - if (fixP->fx_size < sizeof (valueT)) - { - valueT mask; - - mask = 0; - mask--; /* Set all bits to one. */ - mask <<= fixP->fx_size * 8 - (fixP->fx_signed ? 1 : 0); - if ((add_number & mask) != 0 && (add_number & mask) != mask) - { - char buf[50], buf2[50]; - sprint_value (buf, fragP->fr_address + fixP->fx_where); - if (add_number > 1000) - sprint_value (buf2, add_number); - else - sprintf (buf2, "%ld", (long) add_number); - as_bad_where (fixP->fx_file, fixP->fx_line, - _("value of %s too large for field of %d bytes at %s"), - buf2, fixP->fx_size, buf); - } /* Generic error checking. */ - } -#ifdef WARN_SIGNED_OVERFLOW_WORD - /* Warn if a .word value is too large when treated as a signed - number. We already know it is not too negative. This is to - catch over-large switches generated by gcc on the 68k. */ - if (!flag_signed_overflow_ok - && fixP->fx_size == 2 - && add_number > 0x7fff) - as_bad_where (fixP->fx_file, fixP->fx_line, - _("signed .word overflow; switch may be too large; %ld at 0x%lx"), - (long) add_number, - (long) (fragP->fr_address + fixP->fx_where)); -#endif - } /* Not a bit fix. */ - -#ifdef TC_VALIDATE_FIX - skip: ATTRIBUTE_UNUSED_LABEL - ; -#endif -#ifdef DEBUG5 - fprintf (stderr, "result:\n"); - print_fixup (fixP); -#endif - } /* For each fixS in this segment. */ - - TC_ADJUST_RELOC_COUNT (fixP, seg_reloc_count); - return seg_reloc_count; -} - -#endif /* defined (BFD_ASSEMBLER) || (!defined (BFD) && !defined (OBJ_VMS)) */ - void number_to_chars_bigendian (char *buf, valueT val, int n) { @@ -2819,14 +2506,8 @@ print_fixup (fixS *fixp) fprintf (stderr, "\n size=%d frag=%lx where=%ld offset=%lx addnumber=%lx", fixp->fx_size, (long) fixp->fx_frag, (long) fixp->fx_where, (long) fixp->fx_offset, (long) fixp->fx_addnumber); -#ifdef BFD_ASSEMBLER fprintf (stderr, "\n %s (%d)", bfd_get_reloc_code_name (fixp->fx_r_type), fixp->fx_r_type); -#else -#ifdef NEED_FX_R_TYPE - fprintf (stderr, " r_type=%d", fixp->fx_r_type); -#endif -#endif if (fixp->fx_addsy) { fprintf (stderr, "\n +<");