X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Fwrite.c;h=0a6f07aa07795df47f8c7e0aced35c1683a60664;hb=503648e41efa19dfb059757ffddf0206b6060520;hp=2ae110d259aa1c59d170d1c73cc0041203a6bf0a;hpb=c842b53ae1792ed3bc68759dee24dffdbf3bed32;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/write.c b/gas/write.c index 2ae110d259..0a6f07aa07 100644 --- a/gas/write.c +++ b/gas/write.c @@ -1,12 +1,11 @@ /* write.c - emit .o file - Copyright (C) 1986, 87, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000 - Free Software Foundation, Inc. + Copyright (C) 1986-2020 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) + the Free Software Foundation; either version 3, or (at your option) any later version. GAS is distributed in the hope that it will be useful, @@ -16,146 +15,142 @@ 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... */ +/* This thing should be set up to do byte ordering correctly. But... */ #include "as.h" #include "subsegs.h" #include "obstack.h" #include "output-file.h" #include "dwarf2dbg.h" +#include "compress-debug.h" -/* This looks like a good idea. Let's try turning it on always, for now. */ -#undef BFD_FAST_SECTION_FILL -#define BFD_FAST_SECTION_FILL - -#ifndef TC_ADJUST_RELOC_COUNT -#define TC_ADJUST_RELOC_COUNT(FIXP,COUNT) +#ifndef TC_FORCE_RELOCATION +#define TC_FORCE_RELOCATION(FIX) \ + (generic_force_reloc (FIX)) #endif -#ifndef TC_FORCE_RELOCATION -#define TC_FORCE_RELOCATION(FIXP) 0 +#ifndef TC_FORCE_RELOCATION_ABS +#define TC_FORCE_RELOCATION_ABS(FIX) \ + (TC_FORCE_RELOCATION (FIX)) #endif -#ifndef TC_FORCE_RELOCATION_SECTION -#define TC_FORCE_RELOCATION_SECTION(FIXP,SEG) TC_FORCE_RELOCATION(FIXP) +#define GENERIC_FORCE_RELOCATION_LOCAL(FIX) \ + (!(FIX)->fx_pcrel \ + || TC_FORCE_RELOCATION (FIX)) +#ifndef TC_FORCE_RELOCATION_LOCAL +#define TC_FORCE_RELOCATION_LOCAL GENERIC_FORCE_RELOCATION_LOCAL #endif -#ifndef TC_LINKRELAX_FIXUP -#define TC_LINKRELAX_FIXUP(SEG) 1 +#define GENERIC_FORCE_RELOCATION_SUB_SAME(FIX, SEG) \ + (!SEG_NORMAL (SEG)) +#ifndef TC_FORCE_RELOCATION_SUB_SAME +#define TC_FORCE_RELOCATION_SUB_SAME GENERIC_FORCE_RELOCATION_SUB_SAME #endif -#ifndef TC_FIX_ADJUSTABLE -#define TC_FIX_ADJUSTABLE(fix) 1 +#ifndef md_register_arithmetic +# define md_register_arithmetic 1 #endif -#ifndef MD_PCREL_FROM_SECTION -#define MD_PCREL_FROM_SECTION(FIXP, SEC) md_pcrel_from(FIXP) +#ifndef TC_FORCE_RELOCATION_SUB_ABS +#define TC_FORCE_RELOCATION_SUB_ABS(FIX, SEG) \ + (!md_register_arithmetic && (SEG) == reg_section) #endif -#ifndef WORKING_DOT_WORD -extern CONST int md_short_jump_size; -extern CONST int md_long_jump_size; +#ifndef TC_FORCE_RELOCATION_SUB_LOCAL +#ifdef DIFF_EXPR_OK +#define TC_FORCE_RELOCATION_SUB_LOCAL(FIX, SEG) \ + (!md_register_arithmetic && (SEG) == reg_section) +#else +#define TC_FORCE_RELOCATION_SUB_LOCAL(FIX, SEG) 1 +#endif #endif -int symbol_table_frozen; -void print_fixup PARAMS ((fixS *)); +#ifndef TC_VALIDATE_FIX_SUB +#ifdef UNDEFINED_DIFFERENCE_OK +/* The PA needs this for PIC code generation. */ +#define TC_VALIDATE_FIX_SUB(FIX, SEG) \ + (md_register_arithmetic || (SEG) != reg_section) +#else +#define TC_VALIDATE_FIX_SUB(FIX, SEG) \ + ((md_register_arithmetic || (SEG) != reg_section) \ + && ((FIX)->fx_r_type == BFD_RELOC_GPREL32 \ + || (FIX)->fx_r_type == BFD_RELOC_GPREL16)) +#endif +#endif -#ifdef BFD_ASSEMBLER -static void renumber_sections PARAMS ((bfd *, asection *, PTR)); +#ifndef TC_LINKRELAX_FIXUP +#define TC_LINKRELAX_FIXUP(SEG) 1 +#endif -/* 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; +#ifndef MD_APPLY_SYM_VALUE +#define MD_APPLY_SYM_VALUE(FIX) 1 #endif -#ifndef BFD_ASSEMBLER +#ifndef TC_FINALIZE_SYMS_BEFORE_SIZE_SEG +#define TC_FINALIZE_SYMS_BEFORE_SIZE_SEG 1 +#endif -#ifndef MANY_SEGMENTS -struct frag *text_frag_root; -struct frag *data_frag_root; -struct frag *bss_frag_root; +#ifndef MD_PCREL_FROM_SECTION +#define MD_PCREL_FROM_SECTION(FIX, SEC) md_pcrel_from (FIX) +#endif -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. */ +#ifndef TC_FAKE_LABEL +#define TC_FAKE_LABEL(NAME) (strcmp ((NAME), FAKE_LABEL_NAME) == 0) #endif -#ifndef BFD -static object_headers headers; +/* 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 -long string_byte_count; -char *next_object_file_charP; /* Tracks object file bytes. */ +/* Used to control final evaluation of expressions. */ +int finalize_syms = 0; -#ifndef OBJ_VMS -int magic_number_for_object_file = DEFAULT_MAGIC_NUMBER_FOR_OBJECT_FILE; -#endif +int symbol_table_frozen; + +symbolS *abs_section_sym; + +/* Remember the value of dot when parsing expressions. */ +addressT dot_value; + +/* The frag that dot_value is based from. */ +fragS *dot_frag; + +/* Relocs generated by ".reloc" pseudo. */ +struct reloc_list* reloc_list; -#endif /* BFD_ASSEMBLER */ +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; static int n_fixups; -#ifdef BFD_ASSEMBLER -static fixS *fix_new_internal PARAMS ((fragS *, int where, int size, - symbolS *add, symbolS *sub, - offsetT offset, int pcrel, - bfd_reloc_code_real_type r_type)); -#else -static fixS *fix_new_internal PARAMS ((fragS *, int where, int size, - symbolS *add, symbolS *sub, - offsetT offset, int pcrel, - int r_type)); -#endif -#if defined (BFD_ASSEMBLER) || (!defined (BFD) && !defined (OBJ_VMS)) -static long fixup_segment PARAMS ((fixS * fixP, segT this_segment_type)); -#endif -static relax_addressT relax_align PARAMS ((relax_addressT addr, int align)); -#if defined (BFD_ASSEMBLER) || ! defined (BFD) -static fragS *chain_frchains_together_1 PARAMS ((segT, struct frchain *)); -#endif -#ifdef BFD_ASSEMBLER -static void chain_frchains_together PARAMS ((bfd *, segT, PTR)); -static void cvt_frag_to_fill PARAMS ((segT, fragS *)); -static void relax_and_size_seg PARAMS ((bfd *, asection *, PTR)); -static void adjust_reloc_syms PARAMS ((bfd *, asection *, PTR)); -static void write_relocs PARAMS ((bfd *, asection *, PTR)); -static void write_contents PARAMS ((bfd *, asection *, PTR)); -static void set_symtab PARAMS ((void)); -#endif -#if defined (BFD_ASSEMBLER) || (! defined (BFD) && ! defined (OBJ_AOUT)) -static void merge_data_into_text PARAMS ((void)); -#endif -#if ! defined (BFD_ASSEMBLER) && ! defined (BFD) -static void cvt_frag_to_fill PARAMS ((object_headers *, segT, fragS *)); -static void remove_subsegs PARAMS ((frchainS *, int, fragS **, fragS **)); -static void relax_and_size_all_segments PARAMS ((void)); -#endif -#if defined (BFD_ASSEMBLER) && defined (OBJ_COFF) && defined (TE_GO32) -static void set_segment_vma PARAMS ((bfd *, asection *, PTR)); -#endif +#define RELOC_ENUM enum bfd_reloc_code_real /* Create a fixS in obstack 'notes'. */ static fixS * -fix_new_internal (frag, where, size, add_symbol, sub_symbol, offset, pcrel, - r_type) - fragS *frag; /* Which frag? */ - int where; /* Where in that frag? */ - int size; /* 1, 2, or 4 usually. */ - symbolS *add_symbol; /* X_add_symbol. */ - symbolS *sub_symbol; /* X_op_symbol. */ - offsetT offset; /* X_add_number. */ - int pcrel; /* TRUE if PC-relative relocation. */ -#ifdef BFD_ASSEMBLER - bfd_reloc_code_real_type r_type; /* Relocation type. */ -#else - int r_type; /* Relocation type. */ -#endif +fix_new_internal (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. */ + symbolS *sub_symbol, /* X_op_symbol. */ + offsetT offset, /* X_add_number. */ + int pcrel, /* TRUE if PC-relative relocation. */ + RELOC_ENUM r_type /* Relocation type. */, + int at_beginning) /* Add to the start of the list? */ { fixS *fixP; @@ -169,22 +164,20 @@ fix_new_internal (frag, where, size, add_symbol, sub_symbol, offset, pcrel, /* 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; fixP->fx_subsy = sub_symbol; fixP->fx_offset = offset; + fixP->fx_dot_value = dot_value; + fixP->fx_dot_frag = dot_frag; 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; @@ -198,39 +191,33 @@ fix_new_internal (frag, where, size, add_symbol, sub_symbol, offset, pcrel, TC_INIT_FIX_DATA (fixP); #endif - as_where (&fixP->fx_file, &fixP->fx_line); + fixP->fx_file = as_where (&fixP->fx_line); - /* Usually, we want relocs sorted numerically, but while - comparing to older versions of gas that have relocs - reverse sorted, it is convenient to have this compile - 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 - - fixP->fx_next = *seg_fix_rootP; - *seg_fix_rootP = fixP; -#else /* REVERSE_SORT_RELOCS */ - - fixP->fx_next = NULL; - - if (*seg_fix_tailP) - (*seg_fix_tailP)->fx_next = fixP; + if (at_beginning) + { + fixP->fx_next = *seg_fix_rootP; + *seg_fix_rootP = fixP; + if (fixP->fx_next == NULL) + *seg_fix_tailP = fixP; + } else - *seg_fix_rootP = fixP; - *seg_fix_tailP = fixP; - -#endif /* REVERSE_SORT_RELOCS */ + { + fixP->fx_next = NULL; + if (*seg_fix_tailP) + (*seg_fix_tailP)->fx_next = fixP; + else + *seg_fix_rootP = fixP; + *seg_fix_tailP = fixP; + } } return fixP; @@ -239,21 +226,16 @@ fix_new_internal (frag, where, size, add_symbol, sub_symbol, offset, pcrel, /* Create a fixup relative to a symbol (plus a constant). */ fixS * -fix_new (frag, where, size, add_symbol, offset, pcrel, r_type) - fragS *frag; /* Which frag? */ - int where; /* Where in that frag? */ - int size; /* 1, 2, or 4 usually. */ - symbolS *add_symbol; /* X_add_symbol. */ - offsetT offset; /* X_add_number. */ - int pcrel; /* TRUE if PC-relative relocation. */ -#ifdef BFD_ASSEMBLER - bfd_reloc_code_real_type r_type; /* Relocation type. */ -#else - int r_type; /* Relocation type. */ -#endif +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. */) { return fix_new_internal (frag, where, size, add_symbol, - (symbolS *) NULL, offset, pcrel, r_type); + (symbolS *) NULL, offset, pcrel, r_type, FALSE); } /* Create a fixup for an expression. Currently we only support fixups @@ -261,17 +243,12 @@ fix_new (frag, where, size, add_symbol, offset, pcrel, r_type) file formats support anyhow. */ fixS * -fix_new_exp (frag, where, size, exp, pcrel, r_type) - fragS *frag; /* Which frag? */ - int where; /* Where in that frag? */ - int size; /* 1, 2, or 4 usually. */ - expressionS *exp; /* Expression. */ - int pcrel; /* TRUE if PC-relative relocation. */ -#ifdef BFD_ASSEMBLER - bfd_reloc_code_real_type r_type; /* Relocation type. */ -#else - int r_type; /* Relocation type. */ -#endif +fix_new_exp (fragS *frag, /* Which frag? */ + 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. */) { symbolS *add = NULL; symbolS *sub = NULL; @@ -282,6 +259,10 @@ fix_new_exp (frag, where, size, exp, pcrel, r_type) case O_absent: break; + case O_register: + as_bad (_("register value used as expression")); + break; + case O_add: /* This comes up when _GLOBAL_OFFSET_TABLE_+(.-L0) is read, if the difference expression cannot immediately be reduced. */ @@ -299,16 +280,7 @@ fix_new_exp (frag, where, size, exp, pcrel, r_type) 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: @@ -331,15 +303,38 @@ fix_new_exp (frag, where, size, exp, pcrel, r_type) break; } - return fix_new_internal (frag, where, size, add, sub, off, pcrel, r_type); + return fix_new_internal (frag, where, size, add, sub, off, pcrel, + r_type, FALSE); +} + +/* Create a fixup at the beginning of FRAG. The arguments are the same + as for fix_new, except that WHERE is implicitly 0. */ + +fixS * +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, + (symbolS *) NULL, offset, pcrel, r_type, TRUE); +} + +/* Generic function to determine whether a fixup requires a relocation. */ +int +generic_force_reloc (fixS *fix) +{ + if (fix->fx_r_type == BFD_RELOC_VTABLE_INHERIT + || fix->fx_r_type == BFD_RELOC_VTABLE_ENTRY) + return 1; + + if (fix->fx_addsy == NULL) + return 0; + + return S_FORCE_RELOC (fix->fx_addsy, fix->fx_subsy == NULL); } /* Append a string onto another string, bumping the pointer along. */ void -append (charPP, fromP, length) - char **charPP; - char *fromP; - unsigned long length; +append (char **charPP, char *fromP, unsigned long length) { /* Don't trust memcpy() of 0 chars. */ if (length == 0) @@ -349,56 +344,38 @@ append (charPP, fromP, 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 least one object format really uses this info. */ void -record_alignment (seg, align) - /* Segment to which alignment pertains. */ - segT seg; - /* Alignment, as a power of 2 (e.g., 1 => 2-byte boundary, 2 => 4-byte - boundary, etc.) */ - int align; +record_alignment (/* Segment to which alignment pertains. */ + segT seg, + /* Alignment, as a power of 2 (e.g., 1 => 2-byte + boundary, 2 => 4-byte boundary, etc.) */ + unsigned int align) { 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 + + if (align > bfd_section_alignment (seg)) + bfd_set_section_alignment (seg, align); } int -get_recorded_alignment (seg) - segT seg; +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 + return bfd_section_alignment (seg); +} /* Reset the section indices after removing the gas created sections. */ static void -renumber_sections (abfd, sec, countparg) - bfd *abfd ATTRIBUTE_UNUSED; - asection *sec; - PTR countparg; +renumber_sections (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, void *countparg) { int *countp = (int *) countparg; @@ -406,26 +383,17 @@ renumber_sections (abfd, sec, countparg) ++*countp; } -#endif /* defined (BFD_ASSEMBLER) */ - -#if defined (BFD_ASSEMBLER) || ! defined (BFD) - static fragS * -chain_frchains_together_1 (section, frchp) - segT section; - struct frchain *frchp; +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 + gas_assert (prev_frag->fr_type != 0); if (frchp->fix_root != (fixS *) NULL) { if (seg_info (section)->fix_root == (fixS *) NULL) @@ -434,22 +402,17 @@ chain_frchains_together_1 (section, frchp) seg_info (section)->fix_tail = frchp->fix_tail; prev_fix = frchp->fix_tail; } -#endif } - assert (prev_frag->fr_type != 0); + gas_assert (prev_frag != &dummy + && prev_frag->fr_type != 0); prev_frag->fr_next = 0; return prev_frag; } -#endif - -#ifdef BFD_ASSEMBLER - static void -chain_frchains_together (abfd, section, xxx) - bfd *abfd ATTRIBUTE_UNUSED; - segT section; - PTR xxx ATTRIBUTE_UNUSED; +chain_frchains_together (bfd *abfd ATTRIBUTE_UNUSED, + segT section, + void *xxx ATTRIBUTE_UNUSED) { segment_info_type *info; @@ -465,40 +428,13 @@ chain_frchains_together (abfd, section, xxx) frags_chained = 1; } -#endif - -#if !defined (BFD) && !defined (BFD_ASSEMBLER) - -static void -remove_subsegs (head, seg, root, last) - 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 (sec, fragP) - segT sec ATTRIBUTE_UNUSED; - fragS *fragP; -#else -static void -cvt_frag_to_fill (headersP, sec, fragP) - object_headers *headersP; - segT sec; - fragS *fragP; -#endif +cvt_frag_to_fill (segT sec ATTRIBUTE_UNUSED, fragS *fragP) { switch (fragP->fr_type) { + case rs_space_nop: + goto skip_align; case rs_align: case rs_align_code: case rs_align_test: @@ -507,6 +443,7 @@ cvt_frag_to_fill (headersP, sec, fragP) #ifdef HANDLE_ALIGN HANDLE_ALIGN (fragP); #endif + skip_align: know (fragP->fr_next != NULL); fragP->fr_offset = (fragP->fr_next->fr_address - fragP->fr_address @@ -514,13 +451,18 @@ cvt_frag_to_fill (headersP, sec, fragP) if (fragP->fr_offset < 0) { as_bad_where (fragP->fr_file, fragP->fr_line, - _("attempt to .org/.space backwards? (%ld)"), + _("attempt to .org/.space/.nops backwards? (%ld)"), (long) fragP->fr_offset); + fragP->fr_offset = 0; } - fragP->fr_type = rs_fill; + if (fragP->fr_type == rs_space_nop) + fragP->fr_type = rs_fill_nop; + else + fragP->fr_type = rs_fill; break; case rs_fill: + case rs_fill_nop: break; case rs_leb128: @@ -528,6 +470,13 @@ cvt_frag_to_fill (headersP, sec, fragP) valueT value = S_GET_VALUE (fragP->fr_symbol); int size; + if (!S_IS_DEFINED (fragP->fr_symbol)) + { + as_bad_where (fragP->fr_file, fragP->fr_line, + _("leb128 operand is an undefined symbol: %s"), + S_GET_NAME (fragP->fr_symbol)); + } + size = output_leb128 (fragP->fr_literal + fragP->fr_fix, value, fragP->fr_subtype); @@ -548,15 +497,11 @@ cvt_frag_to_fill (headersP, sec, 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) - == fragP->fr_fix)); + gas_assert (fragP->fr_next == NULL + || (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 @@ -587,16 +532,30 @@ cvt_frag_to_fill (headersP, sec, fragP) BAD_CASE (fragP->fr_type); break; } +#ifdef md_frag_check + md_frag_check (fragP); +#endif } -#endif /* defined (BFD_ASSEMBLER) || !defined (BFD) */ +struct relax_seg_info +{ + int pass; + int changed; +}; + +static void +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, info->pass)) + info->changed = 1; +} -#ifdef BFD_ASSEMBLER static void -relax_and_size_seg (abfd, sec, xxx) - bfd *abfd; - asection *sec; - PTR xxx ATTRIBUTE_UNUSED; +size_seg (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, void *xxx ATTRIBUTE_UNUSED) { flagword flags; fragS *fragp; @@ -606,12 +565,9 @@ relax_and_size_seg (abfd, sec, xxx) subseg_change (sec, 0); - flags = bfd_get_section_flags (abfd, sec); - seginfo = seg_info (sec); if (seginfo && seginfo->frchainP) { - relax_segment (seginfo->frchainP->frch_root, sec); for (fragp = seginfo->frchainP->frch_root; fragp; fragp = fragp->fr_next) cvt_frag_to_fill (sec, fragp); for (fragp = seginfo->frchainP->frch_root; @@ -624,24 +580,30 @@ relax_and_size_seg (abfd, sec, xxx) else size = 0; + flags = bfd_section_flags (sec); + if (size == 0 && bfd_section_size (sec) != 0 && + (flags & SEC_HAS_CONTENTS) != 0) + return; + 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; - x = bfd_set_section_flags (abfd, sec, flags); - assert (x == true); + flags &= ~SEC_RELOC; + x = bfd_set_section_flags (sec, flags); + gas_assert (x); - newsize = md_section_align (sec, size); - x = bfd_set_section_size (abfd, sec, newsize); - assert (x == true); + /* If permitted, allow the backend to pad out the section + to some alignment boundary. */ + if (do_not_pad_sections_to_alignment) + newsize = size; + else + newsize = md_section_align (sec, size); + x = bfd_set_section_size (sec, newsize); + gas_assert (x); /* If the size had to be rounded up, add some padding in the last non-empty frag. */ - assert (newsize >= size); + gas_assert (newsize >= size); if (size != newsize) { fragS *last = seginfo->frchainP->frch_last; @@ -649,7 +611,14 @@ relax_and_size_seg (abfd, sec, xxx) while (fragp->fr_next != last) fragp = fragp->fr_next; last->fr_address = size; - fragp->fr_offset += newsize - size; + if ((newsize - size) % fragp->fr_var == 0) + fragp->fr_offset += (newsize - size) / fragp->fr_var; + else + /* If we hit this abort, it's likely due to subsegs_finish not + providing sufficient alignment on the last frag, and the + machine dependent code using alignment frags with fr_var + greater than 1. */ + abort (); } #ifdef tc_frob_section @@ -662,12 +631,8 @@ relax_and_size_seg (abfd, sec, xxx) #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; @@ -699,11 +664,120 @@ 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) +{ + bfd_vma addr_mask = 1; + struct reloc_list *r; + + /* Avoid a shift by the width of type. */ + addr_mask <<= bfd_arch_bits_per_address (stdoutput) - 1; + addr_mask <<= 1; + addr_mask -= 1; + + for (r = reloc_list; r; r = r->next) + { + reloc_howto_type *howto = r->u.a.howto; + expressionS *symval; + symbolS *sym; + bfd_vma offset, addend; + asection *sec; + + 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 && sec != NULL) + { + /* Convert relocs against local symbols to refer to the + corresponding section symbol plus offset instead. Keep + PC-relative relocs of the REL variety intact though to + prevent the offset from overflowing the relocated field, + unless it has enough bits to cover the whole address + space. */ + if (S_IS_LOCAL (sym) && !symbol_section_p (sym) + && (sec->use_rela_p + || (howto->partial_inplace + && (!howto->pc_relative + || howto->src_mask == addr_mask)))) + { + asection *symsec = S_GET_SEGMENT (sym); + if (!(((symsec->flags & SEC_MERGE) != 0 + && addend != 0) + || (symsec->flags & SEC_THREAD_LOCAL) != 0)) + { + addend += S_GET_VALUE (sym); + sym = section_symbol (symsec); + } + } + 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; + } + + 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 (abfd, sec, xxx) - bfd *abfd ATTRIBUTE_UNUSED; - asection *sec; - PTR xxx ATTRIBUTE_UNUSED; +adjust_reloc_syms (bfd *abfd ATTRIBUTE_UNUSED, + asection *sec, + void *xxx ATTRIBUTE_UNUSED) { segment_info_type *seginfo = seg_info (sec); fixS *fixp; @@ -733,348 +807,536 @@ adjust_reloc_syms (abfd, sec, xxx) point. It is possible to see unresolved expression symbols, though, since they are not in the regular symbol table. */ - if (sym != NULL) - resolve_symbol_value (sym, 1); + resolve_symbol_value (sym); if (fixp->fx_subsy != NULL) - resolve_symbol_value (fixp->fx_subsy, 1); + resolve_symbol_value (fixp->fx_subsy); - /* If this symbol is equated to an undefined symbol, convert - the fixup to being against that symbol. */ - if (sym != NULL && symbol_equated_p (sym) - && (! S_IS_DEFINED (sym) || S_IS_COMMON (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; - } - - if (sym != NULL && symbol_mri_common_p (sym)) - { - /* These symbols are handled specially in fixup_segment. */ - goto done; - } - - symsec = S_GET_SEGMENT (sym); - - if (symsec == NULL) - abort (); - - if (bfd_is_abs_section (symsec)) - { - /* The fixup_segment routine will not use this symbol in a - relocation unless TC_FORCE_RELOCATION returns 1. */ - if (TC_FORCE_RELOCATION (fixp)) - { - symbol_mark_used_in_reloc (fixp->fx_addsy); -#ifdef UNDEFINED_DIFFERENCE_OK - if (fixp->fx_subsy != NULL) - symbol_mark_used_in_reloc (fixp->fx_subsy); -#endif - } - goto done; + fixp->fx_addsy = newsym; + sym = newsym; } - /* If it's one of these sections, assume the symbol is - definitely going to be output. The code in - md_estimate_size_before_relax in tc-mips.c uses this test - as well, so if you change this code you should look at that - code. */ - if (bfd_is_und_section (symsec) - || bfd_is_com_section (symsec)) + if (symbol_mri_common_p (sym)) { - symbol_mark_used_in_reloc (fixp->fx_addsy); -#ifdef UNDEFINED_DIFFERENCE_OK - /* We have the difference of an undefined symbol and some - other symbol. Make sure to mark the other symbol as used - in a relocation so that it will always be output. */ - if (fixp->fx_subsy) - symbol_mark_used_in_reloc (fixp->fx_subsy); -#endif - goto done; + fixp->fx_offset += S_GET_VALUE (sym); + fixp->fx_addsy = symbol_get_value_expression (sym)->X_add_symbol; + 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. */ - if (symsec != sec && ! S_IS_LOCAL (sym)) - { - boolean linkonce; - - linkonce = false; -#ifdef BFD_ASSEMBLER - if ((bfd_get_section_flags (stdoutput, symsec) & SEC_LINK_ONCE) - != 0) - linkonce = true; -#endif -#ifdef OBJ_ELF - /* The GNU toolchain uses an extension for ELF: a section - beginning with the magic string .gnu.linkonce is a - linkonce section. */ - if (strncmp (segment_name (symsec), ".gnu.linkonce", - sizeof ".gnu.linkonce" - 1) == 0) - linkonce = true; -#endif + /* If the symbol is undefined, common, weak, or global (ELF + shared libs), we can't replace it with the section symbol. */ + if (S_FORCE_RELOC (fixp->fx_addsy, 1)) + continue; - if (linkonce) - { - symbol_mark_used_in_reloc (fixp->fx_addsy); -#ifdef UNDEFINED_DIFFERENCE_OK - if (fixp->fx_subsy != NULL) - symbol_mark_used_in_reloc (fixp->fx_subsy); + /* Is there some other (target cpu dependent) reason we can't adjust + this one? (E.g. relocations involving function addresses on + the PA. */ +#ifdef tc_fix_adjustable + if (! tc_fix_adjustable (fixp)) + continue; #endif - goto done; - } - } /* Since we're reducing to section symbols, don't attempt to reduce anything that's already using one. */ if (symbol_section_p (sym)) - { - symbol_mark_used_in_reloc (fixp->fx_addsy); - goto done; - } + continue; -#ifdef BFD_ASSEMBLER - /* We can never adjust a reloc against a weak symbol. If we - did, and the weak symbol was overridden by a real symbol - somewhere else, then our relocation would be pointing at - the wrong area of memory. */ - if (S_IS_WEAK (sym)) - { - symbol_mark_used_in_reloc (fixp->fx_addsy); - goto done; - } -#endif + symsec = S_GET_SEGMENT (sym); + if (symsec == NULL) + abort (); - /* Is there some other reason we can't adjust this one? (E.g., - call/bal links in i960-bout symbols.) */ -#ifdef obj_fix_adjustable - if (! obj_fix_adjustable (fixp)) + if (bfd_is_abs_section (symsec) + || symsec == reg_section) { - symbol_mark_used_in_reloc (fixp->fx_addsy); - goto done; + /* The fixup_segment routine normally will not use this + symbol in a relocation. */ + continue; } -#endif - /* Is there some other (target cpu dependent) reason we can't adjust - this one? (E.g. relocations involving function addresses on - the PA. */ -#ifdef tc_fix_adjustable - if (! tc_fix_adjustable (fixp)) + /* 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. */ + if (symsec != sec && ! S_IS_LOCAL (sym)) { - symbol_mark_used_in_reloc (fixp->fx_addsy); - goto done; + if ((symsec->flags & SEC_LINK_ONCE) != 0 + || (IS_ELF + /* The GNU toolchain uses an extension for ELF: a + section beginning with the magic string + .gnu.linkonce is a linkonce section. */ + && strncmp (segment_name (symsec), ".gnu.linkonce", + sizeof ".gnu.linkonce" - 1) == 0)) + continue; } -#endif - /* If the section symbol isn't going to be output, the relocs - at least should still work. If not, figure out what to do - when we run into that case. + /* Never adjust a reloc against local symbol in a merge section + with non-zero addend. */ + if ((symsec->flags & SEC_MERGE) != 0 + && (fixp->fx_offset != 0 || fixp->fx_subsy != NULL)) + continue; + + /* Never adjust a reloc against TLS local symbol. */ + if ((symsec->flags & SEC_THREAD_LOCAL) != 0) + continue; - We refetch the segment when calling section_symbol, rather + /* We refetch the segment when calling section_symbol, rather than using symsec, because S_GET_VALUE may wind up changing the section when it calls resolve_symbol_value. */ fixp->fx_offset += S_GET_VALUE (sym); fixp->fx_addsy = section_symbol (S_GET_SEGMENT (sym)); - symbol_mark_used_in_reloc (fixp->fx_addsy); #ifdef DEBUG5 fprintf (stderr, "\nadjusted fixup:\n"); print_fixup (fixp); #endif - - done: - ; - } -#if 1 /* def RELOC_REQUIRES_SYMBOL */ - else - { - /* There was no symbol required by this relocation. However, - BFD doesn't really handle relocations without symbols well. - (At least, the COFF support doesn't.) So for now we fake up - a local symbol in the absolute section. */ - - fixp->fx_addsy = section_symbol (absolute_section); -#if 0 - fixp->fx_addsy->sy_used_in_reloc = 1; -#endif } -#endif dump_section_relocs (abfd, sec, stderr); } +/* 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_fix to put the fix into the frag data. + Ones that we couldn't completely handle here will be output later + by emit_relocations. */ + static void -write_relocs (abfd, sec, xxx) - bfd *abfd; - asection *sec; - PTR xxx ATTRIBUTE_UNUSED; +fixup_segment (fixS *fixP, segT this_segment) { - segment_info_type *seginfo = seg_info (sec); - unsigned int i; - unsigned int n; - arelent **relocs; - fixS *fixp; - char *err; - - /* If seginfo is NULL, we did not create this section; don't do - anything with it. */ - if (seginfo == NULL) - return; + valueT add_number; + fragS *fragP; + segT add_symbol_segment = absolute_section; - fixup_segment (seginfo->fix_root, sec); + if (fixP != NULL && abs_section_sym == NULL) + abs_section_sym = section_symbol (absolute_section); - n = 0; - for (fixp = seginfo->fix_root; fixp; fixp = fixp->fx_next) - n++; + /* If the linker is doing the relaxing, we must not do any fixups. -#ifndef RELOC_EXPANSION_POSSIBLE - /* Set up reloc information as well. */ - relocs = (arelent **) xmalloc (n * sizeof (arelent *)); - memset ((char *) relocs, 0, n * sizeof (arelent *)); + Well, strictly speaking that's not true -- we could do any that + are PC-relative and don't cross regions that could change size. */ + 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); + } + return; + } - 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; +#ifdef DEBUG5 + fprintf (stderr, "\nprocessing fixup:\n"); + print_fixup (fixP); +#endif - if (fixp->fx_done) + 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) + add_symbol_segment = S_GET_SEGMENT (fixP->fx_addsy); + + if (fixP->fx_subsy != NULL) { - n--; - continue; + 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 + && !S_FORCE_RELOC (fixP->fx_addsy, 0) + && !S_FORCE_RELOC (fixP->fx_subsy, 0) + && !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 + && !S_FORCE_RELOC (fixP->fx_subsy, 0) + && !TC_FORCE_RELOCATION_SUB_ABS (fixP, add_symbol_segment)) + { + add_number -= S_GET_VALUE (fixP->fx_subsy); + fixP->fx_offset = add_number; + fixP->fx_subsy = NULL; + } + else if (sub_symbol_segment == this_segment + && !S_FORCE_RELOC (fixP->fx_subsy, 0) + && !TC_FORCE_RELOCATION_SUB_LOCAL (fixP, add_symbol_segment)) + { + add_number -= S_GET_VALUE (fixP->fx_subsy); + fixP->fx_offset = (add_number + fixP->fx_dot_value + + fixP->fx_dot_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, add_symbol_segment)) + { + if (!md_register_arithmetic + && (add_symbol_segment == reg_section + || sub_symbol_segment == reg_section)) + as_bad_where (fixP->fx_file, fixP->fx_line, + _("register value used as expression")); + else + 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)); + } + else if (sub_symbol_segment != undefined_section + && ! bfd_is_com_section (sub_symbol_segment) + && MD_APPLY_SYM_VALUE (fixP)) + add_number -= S_GET_VALUE (fixP->fx_subsy); } - /* If this is an undefined symbol which was equated to another - symbol, then use generate the reloc against the latter symbol - rather than the former. */ - sym = fixp->fx_addsy; - while (symbol_equated_p (sym) - && (! S_IS_DEFINED (sym) || S_IS_COMMON (sym))) + if (fixP->fx_addsy) { - 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; + if (add_symbol_segment == this_segment + && !S_FORCE_RELOC (fixP->fx_addsy, 0) + && !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 + && !S_FORCE_RELOC (fixP->fx_addsy, 0) + && !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); } - fixp->fx_addsy = sym; - reloc = tc_gen_reloc (sec, fixp); - if (!reloc) + if (fixP->fx_pcrel) { - n--; - continue; + 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 0 - /* 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 (); + if (!fixP->fx_done) + md_apply_fix (fixP, &add_number, this_segment); + + if (!fixP->fx_done) + { + 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_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, + ngettext ("value of %s too large for field " + "of %d byte at %s", + "value of %s too large for field " + "of %d bytes at %s", + fixP->fx_size), + 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 + } + +#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. */ +} - s = bfd_install_relocation (stdoutput, reloc, - fixp->fx_frag->fr_literal, - fixp->fx_frag->fr_address, - sec, &err); - switch (s) +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, + const char *file, unsigned int line) +{ + char *err; + bfd_reloc_status_type s; + asymbol *sym; + + if (reloc->sym_ptr_ptr != NULL + && (sym = *reloc->sym_ptr_ptr) != NULL + && (sym->flags & BSF_KEEP) == 0 + && ((sym->flags & BSF_SECTION_SYM) == 0 + || (EMIT_SECTION_SYMBOLS + && !bfd_is_abs_section (sym->section)))) + as_bad_where (file, line, _("redefined symbol cannot be used on reloc")); + + 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 fragS * +get_frag_for_reloc (fragS *last_frag, + const segment_info_type *seginfo, + const struct reloc_list *r) +{ + fragS *f; + + for (f = last_frag; f != NULL; f = f->fr_next) + if (f->fr_address <= r->u.b.r.address + && r->u.b.r.address < f->fr_address + f->fr_fix) + return f; + + for (f = seginfo->frchainP->frch_root; f != NULL; f = f->fr_next) + if (f->fr_address <= r->u.b.r.address + && r->u.b.r.address < f->fr_address + f->fr_fix) + return f; + + for (f = seginfo->frchainP->frch_root; f != NULL; f = f->fr_next) + if (f->fr_address <= r->u.b.r.address + && r->u.b.r.address <= f->fr_address + f->fr_fix) + return f; + + as_bad_where (r->file, r->line, + _("reloc not within (fixed part of) section")); + return NULL; +} + +static void +write_relocs (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, + void *xxx ATTRIBUTE_UNUSED) +{ + segment_info_type *seginfo = seg_info (sec); + unsigned int n; + struct reloc_list *my_reloc_list, **rp, *r; + arelent **relocs; + fixS *fixp; + fragS *last_frag; + + /* 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) { - 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); + *rp = r->next; + r->next = my_reloc_list; + my_reloc_list = r; + n++; } - relocs[i++] = reloc; + else + rp = &r->next; } -#else - n = n * MAX_RELOC_EXPANSION; - /* Set up reloc information as well. */ - relocs = (arelent **) xmalloc (n * sizeof (arelent *)); - i = 0; + relocs = XCNEWVEC (arelent *, n); + + n = 0; + r = my_reloc_list; + last_frag = NULL; for (fixp = seginfo->fix_root; fixp != (fixS *) NULL; fixp = fixp->fx_next) { + int fx_size, slack; + valueT loc; arelent **reloc; - char *data; - bfd_reloc_status_type s; - symbolS *sym; - int j; +#ifndef RELOC_EXPANSION_POSSIBLE + arelent *rel; - if (fixp->fx_done) - { - n--; - continue; - } + reloc = &rel; +#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_p (sym) - && (! S_IS_DEFINED (sym) || S_IS_COMMON (sym))) - sym = symbol_get_value_expression (sym)->X_add_symbol; - fixp->fx_addsy = sym; + 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 + *reloc = tc_gen_reloc (sec, fixp); +#else reloc = tc_gen_reloc (sec, fixp); +#endif - for (j = 0; reloc[j]; j++) + while (*reloc) { - relocs[i++] = reloc[j]; - assert (i <= n); - } - data = fixp->fx_frag->fr_literal + fixp->fx_where; - 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++) - { - s = bfd_install_relocation (stdoutput, reloc[j], - fixp->fx_frag->fr_literal, - fixp->fx_frag->fr_address, - sec, &err); - switch (s) + while (r != NULL && r->u.b.r.address < (*reloc)->address) { - case bfd_reloc_ok: - break; - case bfd_reloc_overflow: - as_bad_where (fixp->fx_file, fixp->fx_line, - _("relocation overflow")); - break; - default: - as_fatal (_("%s:%u: bad return from bfd_install_relocation"), - fixp->fx_file, fixp->fx_line); + fragS *f = get_frag_for_reloc (last_frag, seginfo, r); + if (f != NULL) + { + last_frag = f; + relocs[n++] = &r->u.b.r; + install_reloc (sec, &r->u.b.r, f, r->file, r->line); + } + r = r->next; } + relocs[n++] = *reloc; + install_reloc (sec, *reloc, fixp->fx_frag, + fixp->fx_file, fixp->fx_line); +#ifndef RELOC_EXPANSION_POSSIBLE + break; +#else + reloc++; +#endif } } - n = i; -#endif + + while (r != NULL) + { + fragS *f = get_frag_for_reloc (last_frag, seginfo, r); + if (f != NULL) + { + last_frag = f; + relocs[n++] = &r->u.b.r; + install_reloc (sec, &r->u.b.r, f, r->file, r->line); + } + r = r->next; + } #ifdef DEBUG4 { - int i, j, nsyms; + unsigned int k, 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 (k = 0; k < n; k++) + if (((*relocs[k]->sym_ptr_ptr)->flags & BSF_SECTION_SYM) == 0) { for (j = 0; j < nsyms; j++) - if (sympp[j] == *relocs[i]->sym_ptr_ptr) + if (sympp[j] == *relocs[k]->sym_ptr_ptr) break; if (j == nsyms) abort (); @@ -1083,11 +1345,12 @@ write_relocs (abfd, sec, xxx) #endif 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_section_flags (sec); + flags |= SEC_RELOC; + bfd_set_section_flags (sec, flags); + bfd_set_reloc (stdoutput, sec, relocs, n); + } #ifdef SET_SECTION_RELOCS SET_SECTION_RELOCS (sec, relocs, n); @@ -1095,34 +1358,249 @@ write_relocs (abfd, sec, xxx) #ifdef DEBUG3 { - int i; - arelent *r; - asymbol *s; + unsigned int k; + fprintf (stderr, "relocs for sec %s\n", sec->name); - for (i = 0; i < n; i++) + for (k = 0; k < n; k++) { - 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); + arelent *rel = relocs[k]; + asymbol *s = *rel->sym_ptr_ptr; + fprintf (stderr, " reloc %2d @%p off %4lx : sym %-10s addend %lx\n", + k, rel, (unsigned long)rel->address, s->name, + (unsigned long)rel->addend); } } #endif } +static int +compress_frag (struct z_stream_s *strm, const char *contents, int in_size, + fragS **last_newf, struct obstack *ob) +{ + int out_size; + int total_out_size = 0; + fragS *f = *last_newf; + char *next_out; + int avail_out; + + /* Call the compression routine repeatedly until it has finished + processing the frag. */ + while (in_size > 0) + { + /* Reserve all the space available in the current chunk. + If none is available, start a new frag. */ + avail_out = obstack_room (ob); + if (avail_out <= 0) + { + obstack_finish (ob); + f = frag_alloc (ob); + f->fr_type = rs_fill; + (*last_newf)->fr_next = f; + *last_newf = f; + avail_out = obstack_room (ob); + } + if (avail_out <= 0) + as_fatal (_("can't extend frag")); + next_out = obstack_next_free (ob); + obstack_blank_fast (ob, avail_out); + out_size = compress_data (strm, &contents, &in_size, + &next_out, &avail_out); + if (out_size < 0) + return -1; + + f->fr_fix += out_size; + total_out_size += out_size; + + /* Return unused space. */ + if (avail_out > 0) + obstack_blank_fast (ob, -avail_out); + } + + return total_out_size; +} + +static void +compress_debug (bfd *abfd, asection *sec, void *xxx ATTRIBUTE_UNUSED) +{ + segment_info_type *seginfo = seg_info (sec); + fragS *f; + fragS *first_newf; + fragS *last_newf; + struct obstack *ob = &seginfo->frchainP->frch_obstack; + bfd_size_type uncompressed_size = (bfd_size_type) sec->size; + bfd_size_type compressed_size; + const char *section_name; + char *compressed_name; + char *header; + struct z_stream_s *strm; + int x; + flagword flags = bfd_section_flags (sec); + unsigned int header_size, compression_header_size; + + if (seginfo == NULL + || sec->size < 32 + || (flags & (SEC_ALLOC | SEC_HAS_CONTENTS)) == SEC_ALLOC) + return; + + section_name = bfd_section_name (sec); + if (strncmp (section_name, ".debug_", 7) != 0) + return; + + strm = compress_init (); + if (strm == NULL) + return; + + if (flag_compress_debug == COMPRESS_DEBUG_GABI_ZLIB) + { + compression_header_size + = bfd_get_compression_header_size (stdoutput, NULL); + header_size = compression_header_size; + } + else + { + compression_header_size = 0; + header_size = 12; + } + + /* Create a new frag to contain the compression header. */ + first_newf = frag_alloc (ob); + if (obstack_room (ob) < header_size) + first_newf = frag_alloc (ob); + if (obstack_room (ob) < header_size) + as_fatal (ngettext ("can't extend frag %lu char", + "can't extend frag %lu chars", + (unsigned long) header_size), + (unsigned long) header_size); + last_newf = first_newf; + obstack_blank_fast (ob, header_size); + last_newf->fr_type = rs_fill; + last_newf->fr_fix = header_size; + header = last_newf->fr_literal; + compressed_size = header_size; + + /* Stream the frags through the compression engine, adding new frags + as necessary to accommodate the compressed output. */ + for (f = seginfo->frchainP->frch_root; + f; + f = f->fr_next) + { + offsetT fill_size; + char *fill_literal; + offsetT count; + int out_size; + + gas_assert (f->fr_type == rs_fill); + if (f->fr_fix) + { + out_size = compress_frag (strm, f->fr_literal, f->fr_fix, + &last_newf, ob); + if (out_size < 0) + return; + compressed_size += out_size; + } + fill_literal = f->fr_literal + f->fr_fix; + fill_size = f->fr_var; + count = f->fr_offset; + gas_assert (count >= 0); + if (fill_size && count) + { + while (count--) + { + out_size = compress_frag (strm, fill_literal, (int) fill_size, + &last_newf, ob); + if (out_size < 0) + return; + compressed_size += out_size; + } + } + } + + /* Flush the compression state. */ + for (;;) + { + int avail_out; + char *next_out; + int out_size; + + /* Reserve all the space available in the current chunk. + If none is available, start a new frag. */ + avail_out = obstack_room (ob); + if (avail_out <= 0) + { + fragS *newf; + + obstack_finish (ob); + newf = frag_alloc (ob); + newf->fr_type = rs_fill; + last_newf->fr_next = newf; + last_newf = newf; + avail_out = obstack_room (ob); + } + if (avail_out <= 0) + as_fatal (_("can't extend frag")); + next_out = obstack_next_free (ob); + obstack_blank_fast (ob, avail_out); + x = compress_finish (strm, &next_out, &avail_out, &out_size); + if (x < 0) + return; + + last_newf->fr_fix += out_size; + compressed_size += out_size; + + /* Return unused space. */ + if (avail_out > 0) + obstack_blank_fast (ob, -avail_out); + + if (x == 0) + break; + } + + /* PR binutils/18087: If compression didn't make the section smaller, + just keep it uncompressed. */ + if (compressed_size >= uncompressed_size) + return; + + /* Replace the uncompressed frag list with the compressed frag list. */ + seginfo->frchainP->frch_root = first_newf; + seginfo->frchainP->frch_last = last_newf; + + /* Update the section size and its name. */ + bfd_update_compression_header (abfd, (bfd_byte *) header, sec); + 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_rename_section (sec, compressed_name); + } +} + +#ifndef md_generate_nops +/* Genenerate COUNT bytes of no-op instructions to WHERE. A target + backend must override this with proper no-op instructions. */ + static void -write_contents (abfd, sec, xxx) - bfd *abfd ATTRIBUTE_UNUSED; - asection *sec; - PTR xxx ATTRIBUTE_UNUSED; +md_generate_nops (fragS *f ATTRIBUTE_UNUSED, + char *where ATTRIBUTE_UNUSED, + offsetT count ATTRIBUTE_UNUSED, + int control ATTRIBUTE_UNUSED) +{ + as_bad (_("unimplemented .nops directive")); +} +#endif + +static void +write_contents (bfd *abfd ATTRIBUTE_UNUSED, + asection *sec, + void *xxx ATTRIBUTE_UNUSED) { segment_info_type *seginfo = seg_info (sec); - unsigned long offset = 0; + addressT offset = 0; fragS *f; /* 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; @@ -1130,28 +1608,57 @@ write_contents (abfd, sec, xxx) f = f->fr_next) { int x; - unsigned long fill_size; + addressT fill_size; char *fill_literal; - long count; + offsetT count; - assert (f->fr_type == rs_fill); + gas_assert (f->fr_type == rs_fill || f->fr_type == rs_fill_nop); if (f->fr_fix) { x = bfd_set_section_contents (stdoutput, sec, f->fr_literal, (file_ptr) offset, (bfd_size_type) f->fr_fix); - if (x == false) - { - bfd_perror (stdoutput->filename); - as_perror (_("FATAL: Can't write %s"), stdoutput->filename); - exit (EXIT_FAILURE); - } + if (!x) + as_fatal (ngettext ("can't write %ld byte " + "to section %s of %s: '%s'", + "can't write %ld bytes " + "to section %s of %s: '%s'", + (long) f->fr_fix), + (long) f->fr_fix, + sec->name, stdoutput->filename, + bfd_errmsg (bfd_get_error ())); offset += f->fr_fix; } - fill_literal = f->fr_literal + f->fr_fix; + fill_size = f->fr_var; count = f->fr_offset; - assert (count >= 0); + fill_literal = f->fr_literal + f->fr_fix; + + if (f->fr_type == rs_fill_nop) + { + gas_assert (count >= 0 && fill_size == 1); + if (count > 0) + { + char *buf = xmalloc (count); + md_generate_nops (f, buf, count, *fill_literal); + x = bfd_set_section_contents + (stdoutput, sec, buf, (file_ptr) offset, + (bfd_size_type) count); + if (!x) + as_fatal (ngettext ("can't fill %ld byte " + "in section %s of %s: '%s'", + "can't fill %ld bytes " + "in section %s of %s: '%s'", + (long) count), (long) count, + sec->name, stdoutput->filename, + bfd_errmsg (bfd_get_error ())); + offset += count; + free (buf); + } + continue; + } + + gas_assert (count >= 0); if (fill_size && count) { char buf[256]; @@ -1164,13 +1671,15 @@ write_contents (abfd, sec, xxx) fill_literal, (file_ptr) offset, (bfd_size_type) fill_size); - if (x == false) - { - bfd_perror (stdoutput->filename); - as_perror (_("FATAL: Can't write %s"), - stdoutput->filename); - exit (EXIT_FAILURE); - } + if (!x) + as_fatal (ngettext ("can't fill %ld byte " + "in section %s of %s: '%s'", + "can't fill %ld bytes " + "in section %s of %s: '%s'", + (long) fill_size), + (long) fill_size, + sec->name, stdoutput->filename, + bfd_errmsg (bfd_get_error ())); offset += fill_size; } } @@ -1198,142 +1707,39 @@ write_contents (abfd, sec, xxx) x = bfd_set_section_contents (stdoutput, sec, buf, (file_ptr) offset, (bfd_size_type) n_per_buf * fill_size); - if (x != true) - as_fatal (_("Cannot write to output file.")); + if (!x) + as_fatal (ngettext ("can't fill %ld byte " + "in section %s of %s: '%s'", + "can't fill %ld bytes " + "in section %s of %s: '%s'", + (long) (n_per_buf * fill_size)), + (long) (n_per_buf * fill_size), + sec->name, stdoutput->filename, + bfd_errmsg (bfd_get_error ())); offset += n_per_buf * fill_size; } } } } } -#endif -#if defined(BFD_ASSEMBLER) || (!defined (BFD) && !defined(OBJ_AOUT)) static void -merge_data_into_text () +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. */ - { - long 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 () +set_symtab (void) { int nsyms; asymbol **asympp; symbolS *symp; - boolean result; - extern PTR bfd_alloc PARAMS ((bfd *, size_t)); + bfd_boolean result; /* 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 @@ -1345,73 +1751,86 @@ set_symtab () if (nsyms) { int i; + bfd_size_type amt = (bfd_size_type) nsyms * sizeof (asymbol *); - asympp = (asymbol **) bfd_alloc (stdoutput, - nsyms * sizeof (asymbol *)); + asympp = (asymbol **) bfd_alloc (stdoutput, amt); symp = symbol_rootP; for (i = 0; i < nsyms; i++, symp = symbol_next (symp)) { asympp[i] = symbol_get_bfdsym (symp); + if (asympp[i]->flags != BSF_SECTION_SYM + || !(bfd_is_const_section (asympp[i]->section) + && asympp[i]->section->symbol == asympp[i])) + asympp[i]->flags |= BSF_KEEP; symbol_mark_written (symp); } } else asympp = 0; result = bfd_set_symtab (stdoutput, asympp, nsyms); - assert (result == true); + gas_assert (result); symbol_table_frozen = 1; } -#endif - -#if defined (BFD_ASSEMBLER) && defined (OBJ_COFF) && defined (TE_GO32) -static void -set_segment_vma (abfd, sec, xxx) - bfd *abfd; - asection *sec; - PTR xxx ATTRIBUTE_UNUSED; -{ - static bfd_vma addr = 0; - - bfd_set_section_vma (abfd, sec, addr); - addr += bfd_section_size (abfd, sec); -} -#endif /* BFD_ASSEMBLER && OBJ_COFF && !TE_PE */ /* Finish the subsegments. After every sub-segment, we fake an - ".align ...". This conforms to BSD4.2 brane-damage. We then fake + ".align ...". This conforms to BSD4.2 brain-damage. We then fake ".fill 0" because that is the kind of frag that requires least thought. ".align" frags like to have a following frag since that makes calculating their intended length trivial. */ #ifndef SUB_SEGMENT_ALIGN -#ifdef BFD_ASSEMBLER -#define SUB_SEGMENT_ALIGN(SEG) (0) +#ifdef HANDLE_ALIGN +/* The last subsegment gets an alignment corresponding to the alignment + of the section. This allows proper nop-filling at the end of + code-bearing sections. */ +#define SUB_SEGMENT_ALIGN(SEG, FRCHAIN) \ + (!(FRCHAIN)->frch_next && subseg_text_p (SEG) \ + && !do_not_pad_sections_to_alignment \ + ? get_recorded_alignment (SEG) \ + : 0) #else -#define SUB_SEGMENT_ALIGN(SEG) (2) +#define SUB_SEGMENT_ALIGN(SEG, FRCHAIN) 0 #endif #endif -void -subsegs_finish () +static void +subsegs_finish_section (asection *s) { struct frchain *frchainP; + segment_info_type *seginfo = seg_info (s); + if (!seginfo) + return; - for (frchainP = frchain_root; frchainP; frchainP = frchainP->frch_next) + for (frchainP = seginfo->frchainP; + frchainP != NULL; + frchainP = frchainP->frch_next) { int alignment; - subseg_set (frchainP->frch_seg, frchainP->frch_subseg); + 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. */ - alignment = had_errors () ? 0 : SUB_SEGMENT_ALIGN (now_seg); + any alignment is meaningless, and, moreover, will look weird + if we are generating a listing. */ + if (had_errors ()) + do_not_pad_sections_to_alignment = 1; + + alignment = SUB_SEGMENT_ALIGN (now_seg, frchainP); + if ((bfd_section_flags (now_seg) & SEC_MERGE) + && now_seg->entsize) + { + unsigned int entsize = now_seg->entsize; + int entalign = 0; - /* The last subsegment gets an aligment corresponding to the - alignment of the section. This allows proper nop-filling - at the end of code-bearing sections. */ - if (!frchainP->frch_next || frchainP->frch_next->frch_seg != now_seg) - alignment = get_recorded_alignment (now_seg); + while ((entsize & 1) == 0) + { + ++entalign; + entsize >>= 1; + } + + if (entalign > alignment) + alignment = entalign; + } if (subseg_text_p (now_seg)) frag_align_code (alignment, 0); @@ -1429,161 +1848,314 @@ subsegs_finish () } } +static void +subsegs_finish (void) +{ + asection *s; + + for (s = stdoutput->sections; s; s = s->next) + subsegs_finish_section (s); +} + +#ifdef OBJ_ELF +static void +create_obj_attrs_section (void) +{ + segT s; + char *p; + offsetT size; + const char *name; + + size = bfd_elf_obj_attr_size (stdoutput); + if (size == 0) + return; + + name = get_elf_backend_data (stdoutput)->obj_attrs_section; + if (!name) + name = ".gnu.attributes"; + s = subseg_new (name, 0); + elf_section_type (s) + = get_elf_backend_data (stdoutput)->obj_attrs_section_type; + 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); + + subsegs_finish_section (s); + relax_segment (seg_info (s)->frchainP->frch_root, s, 0); + size_seg (stdoutput, s, NULL); +} + +/* Create a relocation against an entry in a GNU Build attribute section. */ + +static void +create_note_reloc (segT sec, + symbolS * sym, + bfd_size_type note_offset, + bfd_size_type desc2_offset, + int reloc_type, + bfd_vma addend, + char * note) +{ + struct reloc_list * reloc; + + 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 = symbol_get_bfdsym (sym); + reloc->u.b.r.sym_ptr_ptr = & reloc->u.b.s; + 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); + + if (reloc->u.b.r.howto == NULL) + { + as_bad (_("unable to create reloc for build note")); + return; + } + + reloc->file = N_(""); + reloc->line = 0; + + reloc->next = reloc_list; + reloc_list = reloc; + + /* For REL relocs, store the addend in the section. */ + if (! sec->use_rela_p + /* The SH target is a special case that uses RELA relocs + but still stores the addend in the word being relocated. */ + || strstr (bfd_get_target (stdoutput), "-sh") != NULL) + { + if (target_big_endian) + { + if (bfd_arch_bits_per_address (stdoutput) <= 32) + note[desc2_offset + 3] = addend; + else + note[desc2_offset + 7] = addend; + } + else + note[desc2_offset] = addend; + } +} + +static void +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, + GNU_BUILD_ATTRS_SECTION_NAME) != NULL) + return; + + /* 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 (sec, (SEC_READONLY | SEC_HAS_CONTENTS | SEC_DATA + | SEC_OCTETS)); + bfd_set_section_alignment (sec, 2); + + /* 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; + desc_size = 8; /* Two 4-byte offsets. */ + desc2_offset = 24; + + /* FIXME: The BFD backend for the CRX target does not support the + BFD_RELOC_32, even though it really should. Likewise for the + CR16 target. So we have special case code here... */ + if (strstr (bfd_get_target (stdoutput), "-crx") != NULL) + desc_reloc = BFD_RELOC_CRX_NUM32; + else if (strstr (bfd_get_target (stdoutput), "-cr16") != NULL) + desc_reloc = BFD_RELOC_CR16_NUM32; + else + desc_reloc = BFD_RELOC_32; + } + else + { + note_size = 36; + desc_size = 16; /* Two 8-byte offsets. */ + desc2_offset = 28; + /* FIXME: The BFD backend for the IA64 target does not support the + BFD_RELOC_64, even though it really should. The HPPA backend + has a similar issue, although it does not support BFD_RELOCs at + all! So we have special case code to handle these targets. */ + if (strstr (bfd_get_target (stdoutput), "-ia64") != NULL) + desc_reloc = target_big_endian ? BFD_RELOC_IA64_DIR32MSB : BFD_RELOC_IA64_DIR32LSB; + else if (strstr (bfd_get_target (stdoutput), "-hppa") != NULL) + desc_reloc = 80; /* R_PARISC_DIR64. */ + else + desc_reloc = BFD_RELOC_64; + } + + /* 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) + { + /* Create a version note. */ + 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); + + /* 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. */ + 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); +} +#endif /* OBJ_ELF */ + /* Write the object file. */ void -write_object_file () +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 - /* Do we really want to write it? */ - { - int n_warns, n_errs; - n_warns = had_warnings (); - n_errs = had_errors (); - /* The -Z flag indicates that an object file should be generated, - regardless of warnings and errors. */ - if (flag_always_generate_output) - { - if (n_warns || n_errs) - as_warn (_("%d error%s, %d warning%s, generating bad object file.\n"), - n_errs, n_errs == 1 ? "" : "s", - n_warns, n_warns == 1 ? "" : "s"); - } - else - { - if (n_errs) - as_fatal (_("%d error%s, %d warning%s, no object file generated.\n"), - n_errs, n_errs == 1 ? "" : "s", - n_warns, n_warns == 1 ? "" : "s"); - } - } + subsegs_finish (); + +#ifdef md_pre_output_hook + md_pre_output_hook; +#endif -#ifdef OBJ_VMS - /* Under VMS we try to be compatible with VAX-11 "C". Thus, we call - a routine to check for the definition of the procedure "_main", - and if so -- fix it up so that it can be program entry point. */ - vms_check_for_main (); -#endif /* OBJ_VMS */ +#ifdef md_pre_relax_hook + md_pre_relax_hook; +#endif /* From now on, we don't care about sub-segments. Build one frag chain - for each segment. Linked thru fr_next. */ + for each segment. Linked through fr_next. */ -#ifdef BFD_ASSEMBLER /* Remove the sections created by gas for its own purposes. */ { - asection **seclist, *sec; int i; - seclist = &stdoutput->sections; - while (seclist && *seclist) - { - sec = *seclist; - while (sec == reg_section || sec == expr_section) - { - sec = sec->next; - *seclist = sec; - stdoutput->section_count--; - if (!sec) - break; - } - if (*seclist) - 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 - bfd_map_over_sections (stdoutput, relax_and_size_seg, (char *) 0); -#else - relax_and_size_all_segments (); -#endif /* BFD_ASSEMBLER */ + rsi.pass = 0; + while (1) + { +#ifndef WORKING_DOT_WORD + /* We need to reset the markers in the broken word list and + associated frags between calls to relax_segment (via + relax_seg). Since the broken word list is global, we do it + once per round, rather than locally in relax_segment for each + segment. */ + struct broken_word *brokp; + + for (brokp = broken_words; + brokp != (struct broken_word *) NULL; + brokp = brokp->next_broken_word) + { + brokp->added = 0; -#if defined (BFD_ASSEMBLER) && defined (OBJ_COFF) && defined (TE_GO32) - /* Now that the segments have their final sizes, run through the - sections and set their vma and lma. !BFD gas sets them, and BFD gas - should too. Currently, only DJGPP uses this code, but other - COFF targets may need to execute this too. */ - bfd_map_over_sections (stdoutput, set_segment_vma, (char *) 0); + if (brokp->dispfrag != (fragS *) NULL + && brokp->dispfrag->fr_type == rs_broken_word) + brokp->dispfrag->fr_subtype = 0; + } #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.) + rsi.changed = 0; + bfd_map_over_sections (stdoutput, relax_seg, &rsi); + rsi.pass++; + if (!rsi.changed) + break; + } - 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 = sizeof (string_byte_count); + /* Note - Most ports will use the default value of + TC_FINALIZE_SYMS_BEFORE_SIZE_SEG, which 1. This will force + local symbols to be resolved, removing their frag information. + Some ports however, will not have finished relaxing all of + their frags and will still need the local symbol frag + information. These ports can set + TC_FINALIZE_SYMS_BEFORE_SIZE_SEG to 0. */ + finalize_syms = TC_FINALIZE_SYMS_BEFORE_SIZE_SEG; - obj_crawl_symbol_chain (&headers); + bfd_map_over_sections (stdoutput, size_seg, (char *) 0); - if (string_byte_count == sizeof (string_byte_count)) - string_byte_count = 0; + /* Relaxation has completed. Freeze all syms. */ + finalize_syms = 1; - H_SET_STRING_SIZE (&headers, string_byte_count); + dwarf2dbg_final_check (); - /* 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); +#ifdef md_post_relax_hook + md_post_relax_hook; +#endif - 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 - || ((fragP->fr_next->fr_address - fragP->fr_address) - == (fragP->fr_fix + fragP->fr_offset * fragP->fr_var)))) - abort (); +#ifdef OBJ_ELF + if (IS_ELF) + create_obj_attrs_section (); #endif - } -#endif /* ! BFD_ASSEMBLER */ #ifndef WORKING_DOT_WORD { @@ -1601,33 +2173,15 @@ write_object_file () 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, - 2, &exp); + 2, &exp, TC_PARSE_CONS_RETURN_NONE); #else fix_new_exp (lie->frag, 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 @@ -1671,30 +2225,28 @@ write_object_file () if (lie->added == 2) continue; /* Patch the jump table. */ - /* This is the offset from ??? to table_ptr+0. */ - to_addr = table_addr - S_GET_VALUE (lie->sub); -#ifdef BFD_ASSEMBLER - to_addr -= symbol_get_frag (lie->sub)->fr_address; -#endif -#ifdef TC_CHECK_ADJUSTED_BROKEN_DOT_WORD - TC_CHECK_ADJUSTED_BROKEN_DOT_WORD (to_addr, lie); -#endif - md_number_to_chars (lie->word_goes_here, to_addr, 2); - for (untruth = lie->next_broken_word; + for (untruth = (struct broken_word *) (fragP->fr_symbol); untruth && untruth->dispfrag == fragP; untruth = untruth->next_broken_word) { if (untruth->use_jump == lie) - md_number_to_chars (untruth->word_goes_here, to_addr, 2); + { + /* This is the offset from ??? to table_ptr+0. + The target is the same for all users of this + md_long_jump, but the "sub" bases (and hence the + offsets) may be different. */ + addressT to_word = table_addr - S_GET_VALUE (untruth->sub); +#ifdef TC_CHECK_ADJUSTED_BROKEN_DOT_WORD + TC_CHECK_ADJUSTED_BROKEN_DOT_WORD (to_word, untruth); +#endif + md_number_to_chars (untruth->word_goes_here, to_word, 2); + } } /* Install the long jump. */ /* This is a long jump from table_ptr+0 to the final target. */ from_addr = table_addr; to_addr = S_GET_VALUE (lie->add) + lie->addnum; -#ifdef BFD_ASSEMBLER - to_addr += symbol_get_frag (lie->add)->fr_address; -#endif md_create_long_jump (table_ptr, from_addr, to_addr, lie->dispfrag, lie->add); table_ptr += md_long_jump_size; @@ -1704,132 +2256,6 @@ write_object_file () } #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, 0, 0); - bfd_write (the_object_file, 1, 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) @@ -1837,9 +2263,15 @@ write_object_file () symbolS *symp; for (symp = symbol_rootP; symp; symp = symbol_next (symp)) - resolve_symbol_value (symp, 1); + resolve_symbol_value (symp); } resolve_local_symbol_values (); + resolve_reloc_expr_symbols (); + +#ifdef OBJ_ELF + if (IS_ELF) + maybe_generate_build_notes (); +#endif PROGRESS (1); @@ -1852,16 +2284,35 @@ write_object_file () bfd_map_over_sections (stdoutput, adjust_reloc_syms, (char *) 0); +#ifdef tc_frob_file_before_fix + tc_frob_file_before_fix (); +#endif +#ifdef obj_frob_file_before_fix + obj_frob_file_before_fix (); +#endif + + bfd_map_over_sections (stdoutput, fix_segment, (char *) 0); + /* Set up symbol table, and write it out. */ if (symbol_rootP) { symbolS *symp; + bfd_boolean skip_next_symbol = FALSE; for (symp = symbol_rootP; symp; symp = symbol_next (symp)) { int punt = 0; const char *name; + if (skip_next_symbol) + { + /* Don't do anything besides moving the value of the + symbol from the GAS value-field to the BFD value-field. */ + symbol_get_bfdsym (symp)->value = S_GET_VALUE (symp); + skip_next_symbol = FALSE; + continue; + } + if (symbol_mri_common_p (symp)) { if (S_IS_EXTERNAL (symp)) @@ -1879,36 +2330,41 @@ write_object_file () /* They only differ if `name' is a fb or dollar local label name. */ if (name2 != name && ! S_IS_DEFINED (symp)) - as_bad (_("local label %s is not defined"), name2); + as_bad (_("local label `%s' is not defined"), name2); } /* Do it again, because adjust_reloc_syms might introduce more symbols. They'll probably only be section symbols, but they'll still need to have the values computed. */ - resolve_symbol_value (symp, 1); + resolve_symbol_value (symp); /* Skip symbols which were equated to undefined or common - symbols. */ - if (symbol_equated_p (symp) - && (! S_IS_DEFINED (symp) || S_IS_COMMON (symp))) + symbols. */ + if (symbol_equated_reloc_p (symp) + || S_IS_WEAKREFR (symp)) { + const char *sname = S_GET_NAME (symp); + + if (S_IS_COMMON (symp) + && !TC_FAKE_LABEL (sname) + && !S_IS_WEAKREFR (symp)) + { + expressionS *e = symbol_get_value_expression (symp); + + as_bad (_("`%s' can't be equated to common symbol `%s'"), + sname, S_GET_NAME (e->X_add_symbol)); + } + if (S_GET_SEGMENT (symp) == reg_section) + { + /* Report error only if we know the symbol name. */ + if (S_GET_NAME (symp) != reg_section->name) + as_bad (_("can't make global register symbol `%s'"), + sname); + } 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); -#if 0 - printf ("symbol `%s'\n\t@%x: value=%d flags=%x seg=%s\n", - S_GET_NAME (symp), symp, - S_GET_VALUE (symp), - symbol_get_bfdsym (symp)->flags, - segment_name (S_GET_SEGMENT (symp))); -#endif - #ifdef obj_frob_symbol obj_frob_symbol (symp, punt); #endif @@ -1922,13 +2378,15 @@ write_object_file () want section symbols. Otherwise, we skip local symbols and symbols that the frob_symbol macros told us to punt, but we keep such symbols if they are used in relocs. */ - if ((! EMIT_SECTION_SYMBOLS - && symbol_section_p (symp)) - /* Note that S_IS_EXTERN and S_IS_LOCAL are not always + if (symp == abs_section_sym + || (! EMIT_SECTION_SYMBOLS + && symbol_section_p (symp)) + /* 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) - && (S_IS_LOCAL (symp) || punt) + || (!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); @@ -1942,7 +2400,7 @@ write_object_file () /* Make sure we really got a value for the symbol. */ if (! symbol_resolved_p (symp)) { - as_bad (_("can't resolve value for symbol \"%s\""), + as_bad (_("can't resolve value for symbol `%s'"), S_GET_NAME (symp)); symbol_mark_resolved (symp); } @@ -1950,6 +2408,12 @@ write_object_file () /* Set the value into the BFD symbol. Up til now the value has only been kept in the gas symbolS struct. */ symbol_get_bfdsym (symp)->value = S_GET_VALUE (symp); + + /* A warning construct is a warning symbol followed by the + symbol warned about. Don't let anything object-format or + target-specific muck with it; it's ready for output. */ + if (symbol_get_bfdsym (symp)->flags & BSF_WARNING) + skip_next_symbol = TRUE; } } @@ -1964,6 +2428,10 @@ write_object_file () obj_adjust_symtab (); #endif + /* Stop if there is an error. */ + if (!flag_always_generate_output && had_errors ()) + return; + /* Now that all the sizes are known, and contents correct, we can start writing to the file. */ set_symtab (); @@ -1978,6 +2446,9 @@ write_object_file () #ifdef obj_frob_file obj_frob_file (); #endif +#ifdef obj_coff_generate_pdata + obj_coff_generate_pdata (); +#endif bfd_map_over_sections (stdoutput, write_relocs, (char *) 0); @@ -1988,58 +2459,54 @@ write_object_file () obj_frob_file_after_relocs (); #endif - bfd_map_over_sections (stdoutput, write_contents, (char *) 0); -#endif /* BFD_ASSEMBLER */ -} -#endif /* ! BFD */ - -#ifdef TC_GENERIC_RELAX_TABLE - -static int is_dnrange PARAMS ((fragS *, fragS *)); - -/* Subroutines of relax_segment. */ - -static int -is_dnrange (f1, f2) - fragS *f1; - fragS *f2; -{ - addressT f2addr; +#if defined OBJ_ELF || defined OBJ_MAYBE_ELF + if (IS_ELF && flag_use_elf_stt_common) + stdoutput->flags |= BFD_CONVERT_ELF_COMMON | BFD_USE_ELF_STT_COMMON; +#endif - f2addr = f2->fr_address; - for (; f1; f1 = f1->fr_next) + /* Once all relocations have been written, we can compress the + contents of the debug sections. This needs to be done before + we start writing any sections, because it will affect the file + layout, which is fixed once we start writing contents. */ + if (flag_compress_debug) { - if (f1->fr_next == f2) - return 1; - if (f1->fr_address > f2addr) - break; + if (flag_compress_debug == COMPRESS_DEBUG_GABI_ZLIB) + stdoutput->flags |= BFD_COMPRESS | BFD_COMPRESS_GABI; + else + stdoutput->flags |= BFD_COMPRESS; + bfd_map_over_sections (stdoutput, compress_debug, (char *) 0); } - return 0; + + bfd_map_over_sections (stdoutput, write_contents, (char *) 0); } +#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 -relax_frag (segment, fragP, stretch) - segT segment; - fragS *fragP; - long stretch; +relax_frag (segT segment, fragS *fragP, long stretch) { const relax_typeS *this_type; const relax_typeS *start_type; relax_substateT next_state; relax_substateT this_state; - long aim, target, growth; - symbolS *symbolP = fragP->fr_symbol; - long offset = fragP->fr_offset; - /* Recompute was_address by undoing "+= stretch" done by relax_segment. */ - unsigned long was_address = fragP->fr_address - stretch; - unsigned long address = fragP->fr_address; - const relax_typeS *table = TC_GENERIC_RELAX_TABLE; - + offsetT growth; + offsetT aim; + addressT target; + addressT address; + symbolS *symbolP; + const relax_typeS *table; + + target = fragP->fr_offset; + address = fragP->fr_address + fragP->fr_fix; + table = TC_GENERIC_RELAX_TABLE; this_state = fragP->fr_subtype; start_type = this_type = table + this_state; - target = offset; + symbolP = fragP->fr_symbol; if (symbolP) { @@ -2048,47 +2515,45 @@ relax_frag (segment, fragP, 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) + know (S_GET_SEGMENT (symbolP) != absolute_section || sym_frag == &zero_address_frag); - target += S_GET_VALUE (symbolP) + sym_frag->fr_address; + target += S_GET_VALUE (symbolP); - /* If frag has yet to be reached on this pass, - assume it will move by STRETCH just as we did. - If this is not so, it will be because some frag - between grows, and that will force another pass. - - Beware zero-length frags. */ + /* If SYM_FRAG has yet to be reached on this pass, assume it + will move by STRETCH just as we did, unless there is an + alignment frag between here and SYM_FRAG. An alignment may + well absorb any STRETCH, and we don't want to choose a larger + branch insn by overestimating the needed reach of this + branch. It isn't critical to calculate TARGET exactly; We + know we'll be doing another pass if STRETCH is non-zero. */ if (stretch != 0 - && S_GET_SEGMENT (symbolP) == segment - && (sym_frag->fr_address > was_address - || (sym_frag->fr_address == was_address - && is_dnrange (fragP, sym_frag)))) + && sym_frag->relax_marker != fragP->relax_marker + && S_GET_SEGMENT (symbolP) == segment) { - target += stretch; + if (stretch < 0 + || sym_frag->region == fragP->region) + target += stretch; + /* If we get here we know we have a forward branch. This + relax pass may have stretched previous instructions so + far that omitting STRETCH would make the branch + negative. Don't allow this in case the negative reach is + large enough to require a larger branch instruction. */ + else if (target < address) + 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); -/* #else */ - /* This machine doesn't want to use pcrel_adjust. - In that case, pcrel_adjust should be zero. */ -#if 0 - assert (fragP->fr_targ.ns32k.pcrel_adjust == 0); -#endif #endif -#ifdef md_prepare_relax_scan /* formerly called M68K_AIM_KLUDGE */ + +#ifdef md_prepare_relax_scan + /* Formerly called M68K_AIM_KLUDGE. */ md_prepare_relax_scan (fragP, address, aim, this_state, this_type); #endif @@ -2132,14 +2597,13 @@ relax_frag (segment, fragP, stretch) /* Relax_align. Advance location counter to next address that has 'alignment' lowest order bits all 0s, return size of adjustment made. */ static relax_addressT -relax_align (address, alignment) - register relax_addressT address; /* Address now. */ - register int alignment; /* Alignment (binary). */ +relax_align (relax_addressT address, /* Address now. */ + int alignment /* Alignment (binary). */) { relax_addressT mask; relax_addressT new_address; - mask = ~((~0) << alignment); + mask = ~((relax_addressT) ~0 << alignment); new_address = (address + mask) & (~mask); #ifdef LINKER_RELAXING_SHRINKS_ONLY if (linkrelax) @@ -2160,24 +2624,28 @@ relax_align (address, alignment) these frag addresses may not be the same as final object-file addresses. */ -void -relax_segment (segment_frag_root, segment) - struct frag *segment_frag_root; - segT segment; +int +relax_segment (struct frag *segment_frag_root, segT segment, int pass) { - register struct frag *fragP; - register relax_addressT address; -#if !defined (MANY_SEGMENTS) && !defined (BFD_ASSEMBLER) - know (segment == SEG_DATA || segment == SEG_TEXT || segment == SEG_BSS); -#endif + unsigned long frag_count; + struct frag *fragP; + relax_addressT address; + int region; + int ret; + /* 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) + region = 0; + for (frag_count = 0, fragP = segment_frag_root; + fragP; + fragP = fragP->fr_next, frag_count ++) { + fragP->region = region; + fragP->relax_marker = 0; fragP->fr_address = address; address += fragP->fr_fix; @@ -2198,21 +2666,37 @@ relax_segment (segment_frag_root, segment) if (offset % fragP->fr_var != 0) { - as_bad (_("alignment padding (%lu bytes) not a multiple of %ld"), - (unsigned long) offset, (long) fragP->fr_var); + as_bad_where (fragP->fr_file, fragP->fr_line, + ngettext ("alignment padding (%lu byte) " + "not a multiple of %ld", + "alignment padding (%lu bytes) " + "not a multiple of %ld", + (unsigned long) offset), + (unsigned long) offset, (long) fragP->fr_var); offset -= (offset % fragP->fr_var); } address += offset; + region += 1; } break; case rs_org: - case rs_space: /* Assume .org is nugatory. It will grow with 1st relax. */ + region += 1; + break; + + case rs_space: + case rs_space_nop: break; case rs_machine_dependent: + /* If fr_symbol is an expression, this call to + resolve_symbol_value sets up the correct segment, which will + likely be needed in md_estimate_size_before_relax. */ + if (fragP->fr_symbol) + resolve_symbol_value (fragP->fr_symbol); + address += md_estimate_size_before_relax (fragP, segment); break; @@ -2244,25 +2728,68 @@ relax_segment (segment_frag_root, segment) /* Do relax(). */ { - long 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. */ - long 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 = stretched = 0; + stretch = 0; + stretched = 0; for (fragP = segment_frag_root; fragP; fragP = fragP->fr_next) { - long growth = 0; + offsetT growth = 0; addressT was_address; offsetT offset; symbolS *symbolP; + fragP->relax_marker ^= 1; was_address = fragP->fr_address; address = fragP->fr_address += stretch; symbolP = fragP->fr_symbol; @@ -2297,29 +2824,32 @@ relax_segment (segment_frag_root, segment) if (lie->added) continue; - offset = (symbol_get_frag (lie->add)->fr_address - + S_GET_VALUE (lie->add) + offset = (S_GET_VALUE (lie->add) + lie->addnum - - (symbol_get_frag (lie->sub)->fr_address - + S_GET_VALUE (lie->sub))); + - S_GET_VALUE (lie->sub)); if (offset <= -32768 || offset >= 32767) { if (flag_warn_displacement) { char buf[50]; sprint_value (buf, (addressT) lie->addnum); - as_warn (_(".word %s-%s+%s didn't fit"), - S_GET_NAME (lie->add), - S_GET_NAME (lie->sub), - buf); + as_warn_where (fragP->fr_file, fragP->fr_line, + _(".word %s-%s+%s didn't fit"), + S_GET_NAME (lie->add), + S_GET_NAME (lie->sub), + buf); } - lie->added = 1; if (fragP->fr_subtype == 0) { fragP->fr_subtype++; growth += md_short_jump_size; } - for (untruth = lie->next_broken_word; + + /* Redirect *all* words of this table with the same + target, lest we have to handle the case where the + same target but with a offset that fits on this + round overflows at the next relaxation round. */ + for (untruth = (struct broken_word *) (fragP->fr_symbol); untruth && untruth->dispfrag == lie->dispfrag; untruth = untruth->next_broken_word) if ((symbol_get_frag (untruth->add) @@ -2330,6 +2860,8 @@ relax_segment (segment_frag_root, segment) untruth->added = 2; untruth->use_jump = lie; } + + lie->added = 1; growth += md_long_jump_size; } } @@ -2357,72 +2889,143 @@ relax_segment (segment_frag_root, segment) } 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_address = address + fragP->fr_fix + newoff; + 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 size of new frag in GROWTH. */ + growth += newf->fr_offset * newf->fr_var; + /* Adjust the new frag address for the amount + we'll add when we process the new frag. */ + newf->fr_address -= stretch + growth; + newf->relax_marker ^= 1; + fragP->fr_next = newf; +#ifdef DEBUG + as_warn (_("padding added")); +#endif + } } break; case rs_org: { - long target = offset; - long after; + addressT target = offset; + addressT after; 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 - target += (S_GET_VALUE (symbolP) - + symbol_get_frag (symbolP)->fr_address); - } /* if we have a symbol */ + /* 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; + } know (fragP->fr_next); - after = fragP->fr_next->fr_address; + after = fragP->fr_next->fr_address + stretch; growth = target - after; - if (growth < 0) + + /* Growth may be negative, but variable part of frag + cannot have fewer than 0 chars. That is, we can't + .org backwards. */ + if (address + fragP->fr_fix > target) { - /* Growth may be negative, but variable part of frag - cannot have fewer than 0 chars. That is, we can't - .org backwards. */ + 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; + } + as_bad_where (fragP->fr_file, fragP->fr_line, - _("attempt to .org backwards ignored")); + _("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 - address; - growth = stretch; } - - /* This is an absolute growth factor */ - growth -= stretch; - break; } + break; case rs_space: + case rs_space_nop: + growth = 0; if (symbolP) { - growth = S_GET_VALUE (symbolP); - if (symbol_get_frag (symbolP) != &zero_address_frag + offsetT amount; + + amount = S_GET_VALUE (symbolP); + if (S_GET_SEGMENT (symbolP) != absolute_section || S_IS_COMMON (symbolP) || ! S_IS_DEFINED (symbolP)) - as_bad_where (fragP->fr_file, fragP->fr_line, - _(".space specifies non-absolute value")); - fragP->fr_symbol = 0; - if (growth < 0) { - as_warn (_(".space or .fill with negative value, ignored")); - growth = 0; + as_bad_where (fragP->fr_file, fragP->fr_line, + _(".space specifies non-absolute value")); + /* Prevent repeat of this error message. */ + fragP->fr_symbol = 0; + } + 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, .nops or .fill with negative value, ignored")); + fragP->fr_symbol = 0; } + else + growth = (was_address + fragP->fr_fix + amount + - fragP->fr_next->fr_address); } - else - growth = 0; break; case rs_machine_dependent: @@ -2432,7 +3035,8 @@ relax_segment (segment_frag_root, segment) #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; @@ -2440,9 +3044,9 @@ relax_segment (segment_frag_root, segment) case rs_leb128: { valueT value; - int size; + offsetT size; - value = resolve_symbol_value (fragP->fr_symbol, 0); + value = resolve_symbol_value (fragP->fr_symbol); size = sizeof_leb128 (value, fragP->fr_subtype); growth = size - fragP->fr_offset; fragP->fr_offset = size; @@ -2464,405 +3068,46 @@ relax_segment (segment_frag_root, segment) if (growth) { stretch += growth; - stretched++; + 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. */ - } - while (stretched); /* Until nothing further to relax. */ - } /* do_relax */ - - /* We now have valid fr_address'es for each frag. */ - - /* All fr_address's are correct, relative to their own segment. - We have made all the fixS we will ever make. */ -} - -#if defined (BFD_ASSEMBLER) || (!defined (BFD) && !defined (OBJ_VMS)) - -#ifndef TC_RELOC_RTSYM_LOC_FIXUP -#define TC_RELOC_RTSYM_LOC_FIXUP(X) (1) -#endif - -/* 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_fix 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 (fixP, this_segment_type) - register fixS *fixP; - segT this_segment_type; /* N_TYPE bits for segment. */ -{ - long seg_reloc_count = 0; - symbolS *add_symbolP; - symbolS *sub_symbolP; - valueT add_number; - int size; - char *place; - long where; - int pcrel, plt; - fragS *fragP; - segT add_symbol_segment = absolute_section; - - /* 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 (the only machine for which we've got a relaxing linker right now), - 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_type)) - { - for (; fixP; fixP = fixP->fx_next) - 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); - where = fixP->fx_where; - place = fragP->fr_literal + where; - size = fixP->fx_size; - add_symbolP = fixP->fx_addsy; -#ifdef TC_VALIDATE_FIX - TC_VALIDATE_FIX (fixP, this_segment_type, skip); -#endif - sub_symbolP = fixP->fx_subsy; - add_number = fixP->fx_offset; - pcrel = fixP->fx_pcrel; - plt = fixP->fx_plt; - - if (add_symbolP != NULL - && symbol_mri_common_p (add_symbolP)) - { - know (add_symbolP->sy_value.X_op == O_symbol); - add_number += S_GET_VALUE (add_symbolP); - fixP->fx_offset = add_number; - add_symbolP = fixP->fx_addsy = - symbol_get_value_expression (add_symbolP)->X_add_symbol; - } - - if (add_symbolP) - add_symbol_segment = S_GET_SEGMENT (add_symbolP); - - if (sub_symbolP) - { - resolve_symbol_value (sub_symbolP, 1); - if (add_symbolP == NULL || add_symbol_segment == absolute_section) - { - if (add_symbolP != NULL) - { - add_number += S_GET_VALUE (add_symbolP); - add_symbolP = NULL; - fixP->fx_addsy = NULL; - } - - /* It's just -sym. */ - if (S_GET_SEGMENT (sub_symbolP) == absolute_section) - { - add_number -= S_GET_VALUE (sub_symbolP); - fixP->fx_subsy = NULL; - } - else if (pcrel - && S_GET_SEGMENT (sub_symbolP) == this_segment_type) - { - /* Should try converting to a constant. */ - goto bad_sub_reloc; - } - else - bad_sub_reloc: - as_bad_where (fixP->fx_file, fixP->fx_line, - _("Negative of non-absolute symbol %s"), - S_GET_NAME (sub_symbolP)); - } - else if (S_GET_SEGMENT (sub_symbolP) == add_symbol_segment - && SEG_NORMAL (add_symbol_segment)) - { - /* Difference of 2 symbols from same segment. - Can't make difference of 2 undefineds: 'value' means - something different for N_UNDF. */ -#ifdef TC_I960 - /* Makes no sense to use the difference of 2 arbitrary symbols - as the target of a call instruction. */ - if (fixP->fx_tcbit) - as_bad_where (fixP->fx_file, fixP->fx_line, - _("callj to difference of 2 symbols")); -#endif /* TC_I960 */ - add_number += S_GET_VALUE (add_symbolP) - - S_GET_VALUE (sub_symbolP); - - add_symbolP = NULL; - pcrel = 0; /* No further pcrel processing. */ - - /* Let the target machine make the final determination - as to whether or not a relocation will be needed to - handle this fixup. */ - if (!TC_FORCE_RELOCATION_SECTION (fixP, this_segment_type)) - { - fixP->fx_pcrel = 0; - fixP->fx_addsy = NULL; - fixP->fx_subsy = NULL; - } - } - else - { - /* Different segments in subtraction. */ - know (!(S_IS_EXTERNAL (sub_symbolP) - && (S_GET_SEGMENT (sub_symbolP) == absolute_section))); - - if ((S_GET_SEGMENT (sub_symbolP) == absolute_section)) - add_number -= S_GET_VALUE (sub_symbolP); - -#ifdef DIFF_EXPR_OK - else if (S_GET_SEGMENT (sub_symbolP) == this_segment_type -#if 0 - /* Do this even if it's already described as - pc-relative. For example, on the m68k, an - operand of "pc@(foo-.-2)" should address - "foo" in a pc-relative mode. */ - && pcrel -#endif - ) - { - /* Make it pc-relative. */ - add_number += (MD_PCREL_FROM_SECTION (fixP, this_segment_type) - - S_GET_VALUE (sub_symbolP)); - pcrel = 1; - fixP->fx_pcrel = 1; - sub_symbolP = 0; - fixP->fx_subsy = 0; - } -#endif -#ifdef UNDEFINED_DIFFERENCE_OK - /* The PA needs this for PIC code generation. We basically - don't want to do anything if we have the difference of two - symbols at this point. */ - else if (1) - { - /* Leave it alone. */ - } -#endif -#ifdef BFD_ASSEMBLER - else if (fixP->fx_r_type == BFD_RELOC_GPREL32 - || fixP->fx_r_type == BFD_RELOC_GPREL16) - { - /* Leave it alone. */ - } -#endif - else - { - char buf[50]; - sprint_value (buf, fragP->fr_address + where); - as_bad_where (fixP->fx_file, fixP->fx_line, - _("Subtraction of two symbols in different sections \"%s\" {%s section} - \"%s\" {%s section} at file address %s."), - S_GET_NAME (add_symbolP), - segment_name (S_GET_SEGMENT (add_symbolP)), - S_GET_NAME (sub_symbolP), - segment_name (S_GET_SEGMENT (sub_symbolP)), - buf); - } - } - } - - if (add_symbolP) - { - if (add_symbol_segment == this_segment_type && pcrel && !plt - && TC_RELOC_RTSYM_LOC_FIXUP (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. */ -#ifdef TC_I960 - /* reloc_callj() may replace a 'call' with a 'calls' or a - 'bal', in which cases it modifies *fixP as appropriate. - In the case of a 'calls', no further work is required, - and *fixP has been set up to make the rest of the code - below a no-op. */ - reloc_callj (fixP); -#endif /* TC_I960 */ - - add_number += S_GET_VALUE (add_symbolP); - add_number -= MD_PCREL_FROM_SECTION (fixP, this_segment_type); - /* Lie. Don't want further pcrel processing. */ - pcrel = 0; - - /* Let the target machine make the final determination - as to whether or not a relocation will be needed to - handle this fixup. */ - if (!TC_FORCE_RELOCATION (fixP)) - { - fixP->fx_pcrel = 0; - fixP->fx_addsy = NULL; - } - } - else - { - if (add_symbol_segment == absolute_section - && ! pcrel) - { -#ifdef TC_I960 - /* See comment about reloc_callj() above. */ - reloc_callj (fixP); -#endif /* TC_I960 */ - add_number += S_GET_VALUE (add_symbolP); - - /* Let the target machine make the final determination - as to whether or not a relocation will be needed to - handle this fixup. */ - - if (!TC_FORCE_RELOCATION (fixP)) - { - fixP->fx_addsy = NULL; - add_symbolP = NULL; - } - } - else if (add_symbol_segment == undefined_section -#ifdef BFD_ASSEMBLER - || bfd_is_com_section (add_symbol_segment) -#endif - ) - { -#ifdef TC_I960 - if ((int) fixP->fx_bit_fixP == 13) - { - /* This is a COBR instruction. They have only a - 13-bit displacement and are only to be used - for local branches: flag as error, don't generate - relocation. */ - as_bad_where (fixP->fx_file, fixP->fx_line, - _("can't use COBR format with external label")); - fixP->fx_addsy = NULL; - fixP->fx_done = 1; - continue; - } /* COBR. */ -#endif /* TC_I960 */ - -#ifdef OBJ_COFF -#ifdef TE_I386AIX - if (S_IS_COMMON (add_symbolP)) - add_number += S_GET_VALUE (add_symbolP); -#endif /* TE_I386AIX */ -#endif /* OBJ_COFF */ - ++seg_reloc_count; - } - else - { - seg_reloc_count++; - if (TC_FIX_ADJUSTABLE (fixP)) - add_number += S_GET_VALUE (add_symbolP); - } - } - } - - if (pcrel) - { - add_number -= MD_PCREL_FROM_SECTION (fixP, this_segment_type); - if (add_symbolP == 0) - { -#ifndef BFD_ASSEMBLER - fixP->fx_addsy = &abs_symbol; -#else - fixP->fx_addsy = section_symbol (absolute_section); -#endif - symbol_mark_used_in_reloc (fixP->fx_addsy); - ++seg_reloc_count; - } - } - - if (!fixP->fx_done) - { -#ifdef MD_APPLY_FIX3 - md_apply_fix3 (fixP, &add_number, this_segment_type); -#else -#ifdef BFD_ASSEMBLER - md_apply_fix (fixP, &add_number); -#else - md_apply_fix (fixP, add_number); -#endif -#endif - -#ifndef TC_HANDLES_FX_DONE - /* If the tc-* files haven't been converted, assume it's handling - it the old way, where a null fx_addsy means that the fix has - been applied completely, and no further work is needed. */ - if (fixP->fx_addsy == 0 && fixP->fx_pcrel == 0) - fixP->fx_done = 1; -#endif - } - - if (!fixP->fx_bit_fixP && !fixP->fx_no_overflow && size > 0) - { - if ((size_t) size < sizeof (valueT)) - { - valueT mask; + } - mask = 0; - mask--; /* Set all bits to one. */ - mask <<= 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 + 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, 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 - && 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, - (unsigned long) (fragP->fr_address + where)); -#endif - } /* Not a bit fix. */ + if (stretch == 0 + && (rs_leb128_fudge & 16) == 0 + && (rs_leb128_fudge & -16) != 0) + rs_leb128_fudge += 1; + else + rs_leb128_fudge = 0; + } + /* Until nothing further to relax. */ + while (stretched && -- max_iterations); -#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. */ + if (stretched) + as_fatal (_("Infinite loop encountered whilst attempting to compute the addresses of symbols in section %s"), + segment_name (segment)); + } - TC_ADJUST_RELOC_COUNT (fixP, seg_reloc_count); - return seg_reloc_count; + for (fragP = segment_frag_root; fragP; fragP = fragP->fr_next) + if (fragP->last_fr_address != fragP->fr_address) + { + fragP->last_fr_address = fragP->fr_address; + ret = 1; + } + return ret; } -#endif /* defined (BFD_ASSEMBLER) || (!defined (BFD) && !defined (OBJ_VMS)) */ - void -number_to_chars_bigendian (buf, val, n) - char *buf; - valueT val; - int n; +number_to_chars_bigendian (char *buf, valueT val, int n) { - if ((size_t) n > sizeof (val) || n <= 0) + if (n <= 0) abort (); while (n--) { @@ -2872,12 +3117,9 @@ number_to_chars_bigendian (buf, val, n) } void -number_to_chars_littleendian (buf, val, n) - char *buf; - valueT val; - int n; +number_to_chars_littleendian (char *buf, valueT val, int n) { - if ((size_t) n > sizeof (val) || n <= 0) + if (n <= 0) abort (); while (n--) { @@ -2887,8 +3129,7 @@ number_to_chars_littleendian (buf, val, n) } void -write_print_statistics (file) - FILE *file; +write_print_statistics (FILE *file) { fprintf (file, "fixups: %d\n", n_fixups); } @@ -2897,38 +3138,28 @@ write_print_statistics (file) extern int indent_level; void -print_fixup (fixp) - fixS *fixp; +print_fixup (fixS *fixp) { indent_level = 1; - fprintf (stderr, "fix %lx %s:%d", (long) fixp, fixp->fx_file, fixp->fx_line); + fprintf (stderr, "fix "); + fprintf_vma (stderr, (bfd_vma)((bfd_hostptr_t) fixp)); + fprintf (stderr, " %s:%d",fixp->fx_file, fixp->fx_line); if (fixp->fx_pcrel) 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) fprintf (stderr, " done"); - 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 size=%d frag=", fixp->fx_size); + fprintf_vma (stderr, (bfd_vma) ((bfd_hostptr_t) fixp->fx_frag)); + fprintf (stderr, " where=%ld offset=%lx addnumber=%lx", + (long) fixp->fx_where, + (unsigned long) fixp->fx_offset, + (unsigned long) fixp->fx_addnumber); 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 +<");