From 2a9ea95d682586d2b0c31da28d82a73d786c7c0a Mon Sep 17 00:00:00 2001 From: obrien Date: Fri, 12 May 2000 23:15:20 +0000 Subject: Import of Binutils 2.10 snapshot. --- contrib/binutils/gas/write.c | 367 +++++++++++++++++++++++-------------------- 1 file changed, 199 insertions(+), 168 deletions(-) (limited to 'contrib/binutils/gas/write.c') diff --git a/contrib/binutils/gas/write.c b/contrib/binutils/gas/write.c index e59ddb7..e386ece 100644 --- a/contrib/binutils/gas/write.c +++ b/contrib/binutils/gas/write.c @@ -1,5 +1,5 @@ /* write.c - emit .o file - Copyright (C) 1986, 87, 90, 91, 92, 93, 94, 95, 96, 97, 1998 + Copyright (C) 1986, 87, 90, 91, 92, 93, 94, 95, 96, 97, 98, 1999 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -166,7 +166,7 @@ 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 %d"), size); abort (); } fixP->fx_addsy = add_symbol; @@ -186,6 +186,11 @@ fix_new_internal (frag, where, size, add_symbol, sub_symbol, offset, pcrel, fixP->fx_no_overflow = 0; fixP->fx_signed = 0; +#ifdef USING_CGEN + fixP->fx_cgen.insn = NULL; + fixP->fx_cgen.opinfo = 0; +#endif + #ifdef TC_FIX_TYPE TC_INIT_FIX_DATA(fixP); #endif @@ -298,7 +303,7 @@ fix_new_exp (frag, where, size, exp, pcrel, r_type) #if defined(TC_RVA_RELOC) r_type = TC_RVA_RELOC; #else - as_fatal("rva not supported"); + as_fatal(_("rva not supported")); #endif #endif break; @@ -377,7 +382,7 @@ record_alignment (seg, align) static void renumber_sections (abfd, sec, countparg) - bfd *abfd; + bfd *abfd ATTRIBUTE_UNUSED; asection *sec; PTR countparg; { @@ -428,9 +433,9 @@ chain_frchains_together_1 (section, frchp) static void chain_frchains_together (abfd, section, xxx) - bfd *abfd; /* unused */ + bfd *abfd ATTRIBUTE_UNUSED; segT section; - PTR xxx; /* unused */ + PTR xxx ATTRIBUTE_UNUSED; { segment_info_type *info; @@ -493,8 +498,9 @@ cvt_frag_to_fill (headersP, sec, fragP) - fragP->fr_fix) / fragP->fr_var; if (fragP->fr_offset < 0) { - as_bad ("attempt to .org/.space backwards? (%ld)", - (long) fragP->fr_offset); + as_bad_where (fragP->fr_file, fragP->fr_line, + _("attempt to .org/.space backwards? (%ld)"), + (long) fragP->fr_offset); } fragP->fr_type = rs_fill; break; @@ -573,7 +579,7 @@ static void relax_and_size_seg (abfd, sec, xxx) bfd *abfd; asection *sec; - PTR xxx; + PTR xxx ATTRIBUTE_UNUSED; { flagword flags; fragS *fragp; @@ -639,7 +645,7 @@ relax_and_size_seg (abfd, sec, xxx) #ifdef DEBUG2 static void dump_section_relocs (abfd, sec, stream_) - bfd *abfd; + bfd *abfd ATTRIBUTE_UNUSED; asection *sec; char *stream_; { @@ -654,22 +660,16 @@ dump_section_relocs (abfd, sec, stream_) while (fixp) { symbolS *s = fixp->fx_addsy; - if (s) + + fprintf (stream, " %08lx: type %d ", (unsigned long) fixp, + (int) fixp->fx_r_type); + if (s == NULL) + fprintf (stream, "no sym\n"); + else { - fprintf (stream, " %08x: %s(%s", fixp, S_GET_NAME (s), - s->bsym->section->name); - if (s->bsym->flags & BSF_SECTION_SYM) - { - fprintf (stream, " section sym"); - if (S_GET_VALUE (s)) - fprintf (stream, "+%x", S_GET_VALUE (s)); - } - else - fprintf (stream, "+%x", S_GET_VALUE (s)); - fprintf (stream, ")+%x\n", fixp->fx_offset); + print_symbol_value_1 (stream, s); + fprintf (stream, "\n"); } - else - fprintf (stream, " %08x: type %d no sym\n", fixp, fixp->fx_r_type); fixp = fixp->fx_next; } } @@ -683,9 +683,9 @@ dump_section_relocs (abfd, sec, stream_) static void adjust_reloc_syms (abfd, sec, xxx) - bfd *abfd; + bfd *abfd ATTRIBUTE_UNUSED; asection *sec; - PTR xxx; + PTR xxx ATTRIBUTE_UNUSED; { segment_info_type *seginfo = seg_info (sec); fixS *fixp; @@ -714,39 +714,43 @@ 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 && ! sym->sy_resolved) + if (sym != NULL) resolve_symbol_value (sym, 1); - if (fixp->fx_subsy != NULL && ! fixp->fx_subsy->sy_resolved) + + if (fixp->fx_subsy != NULL) resolve_symbol_value (fixp->fx_subsy, 1); /* If this symbol is equated to an undefined symbol, convert the fixup to being against that symbol. */ - if (sym->sy_value.X_op == O_symbol + if (sym != NULL && symbol_equated_p (sym) && (! S_IS_DEFINED (sym) || S_IS_COMMON (sym))) { - fixp->fx_offset += sym->sy_value.X_add_number; - sym = sym->sy_value.X_add_symbol; + fixp->fx_offset += symbol_get_value_expression (sym)->X_add_number; + sym = symbol_get_value_expression (sym)->X_add_symbol; fixp->fx_addsy = sym; } - symsec = S_GET_SEGMENT (sym); - - if (sym != NULL && sym->sy_mri_common) + 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)) { - fixp->fx_addsy->sy_used_in_reloc = 1; + symbol_mark_used_in_reloc (fixp->fx_addsy); #ifdef UNDEFINED_DIFFERENCE_OK if (fixp->fx_subsy != NULL) - fixp->fx_subsy->sy_used_in_reloc = 1; + symbol_mark_used_in_reloc (fixp->fx_subsy); #endif } goto done; @@ -760,22 +764,22 @@ adjust_reloc_syms (abfd, sec, xxx) if (bfd_is_und_section (symsec) || bfd_is_com_section (symsec)) { - fixp->fx_addsy->sy_used_in_reloc = 1; + 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) - fixp->fx_subsy->sy_used_in_reloc = 1; + symbol_mark_used_in_reloc (fixp->fx_subsy); #endif goto done; } - /* Don't try to reduce relocs which refer to .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) + /* 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; @@ -796,10 +800,10 @@ adjust_reloc_syms (abfd, sec, xxx) if (linkonce) { - fixp->fx_addsy->sy_used_in_reloc = 1; + symbol_mark_used_in_reloc (fixp->fx_addsy); #ifdef UNDEFINED_DIFFERENCE_OK if (fixp->fx_subsy != NULL) - fixp->fx_subsy->sy_used_in_reloc = 1; + symbol_mark_used_in_reloc (fixp->fx_subsy); #endif goto done; } @@ -807,18 +811,30 @@ adjust_reloc_syms (abfd, sec, xxx) /* Since we're reducing to section symbols, don't attempt to reduce anything that's already using one. */ - if (sym->bsym->flags & BSF_SECTION_SYM) + if (symbol_section_p (sym)) + { + symbol_mark_used_in_reloc (fixp->fx_addsy); + goto done; + } + +#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)) { - fixp->fx_addsy->sy_used_in_reloc = 1; + symbol_mark_used_in_reloc (fixp->fx_addsy); goto done; } +#endif /* 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)) { - fixp->fx_addsy->sy_used_in_reloc = 1; + symbol_mark_used_in_reloc (fixp->fx_addsy); goto done; } #endif @@ -829,7 +845,7 @@ adjust_reloc_syms (abfd, sec, xxx) #ifdef tc_fix_adjustable if (! tc_fix_adjustable (fixp)) { - fixp->fx_addsy->sy_used_in_reloc = 1; + symbol_mark_used_in_reloc (fixp->fx_addsy); goto done; } #endif @@ -843,7 +859,11 @@ adjust_reloc_syms (abfd, sec, xxx) the section when it calls resolve_symbol_value. */ fixp->fx_offset += S_GET_VALUE (sym); fixp->fx_addsy = section_symbol (S_GET_SEGMENT (sym)); - fixp->fx_addsy->sy_used_in_reloc = 1; + symbol_mark_used_in_reloc (fixp->fx_addsy); +#ifdef DEBUG5 + fprintf (stderr, "\nadjusted fixup:\n"); + print_fixup (fixp); +#endif done: ; @@ -868,7 +888,7 @@ static void write_relocs (abfd, sec, xxx) bfd *abfd; asection *sec; - PTR xxx; + PTR xxx ATTRIBUTE_UNUSED; { segment_info_type *seginfo = seg_info (sec); int i; @@ -910,17 +930,17 @@ write_relocs (abfd, sec, xxx) symbol, then use generate the reloc against the latter symbol rather than the former. */ sym = fixp->fx_addsy; - while (sym->sy_value.X_op == O_symbol + while (symbol_equated_p (sym) && (! S_IS_DEFINED (sym) || S_IS_COMMON (sym))) { symbolS *n; /* We must avoid looping, as that can occur with a badly written program. */ - n = sym->sy_value.X_add_symbol; + n = symbol_get_value_expression (sym)->X_add_symbol; if (n == sym) break; - fixp->fx_offset += sym->sy_value.X_add_number; + fixp->fx_offset += symbol_get_value_expression (sym)->X_add_number; sym = n; } fixp->fx_addsy = sym; @@ -948,11 +968,14 @@ write_relocs (abfd, sec, xxx) case bfd_reloc_ok: break; case bfd_reloc_overflow: - as_bad_where (fixp->fx_file, fixp->fx_line, "relocation 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", - fixp->fx_file, fixp->fx_line); + as_fatal (_("%s:%u: bad return from bfd_install_relocation: %x"), + fixp->fx_file, fixp->fx_line, s); } relocs[i++] = reloc; } @@ -980,9 +1003,9 @@ write_relocs (abfd, sec, xxx) symbol, then use generate the reloc against the latter symbol rather than the former. */ sym = fixp->fx_addsy; - while (sym->sy_value.X_op == O_symbol + while (symbol_equated_p (sym) && (! S_IS_DEFINED (sym) || S_IS_COMMON (sym))) - sym = sym->sy_value.X_add_symbol; + sym = symbol_get_value_expression (sym)->X_add_symbol; fixp->fx_addsy = sym; reloc = tc_gen_reloc (sec, fixp); @@ -996,7 +1019,7 @@ write_relocs (abfd, sec, xxx) 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"); + _("internal error: fixup not contained within frag")); for (j = 0; reloc[j]; j++) { s = bfd_install_relocation (stdoutput, reloc[j], @@ -1009,10 +1032,10 @@ write_relocs (abfd, sec, xxx) break; case bfd_reloc_overflow: as_bad_where (fixp->fx_file, fixp->fx_line, - "relocation overflow"); + _("relocation overflow")); break; default: - as_fatal ("%s:%u: bad return from bfd_install_relocation", + as_fatal (_("%s:%u: bad return from bfd_install_relocation"), fixp->fx_file, fixp->fx_line); } } @@ -1045,6 +1068,10 @@ write_relocs (abfd, sec, xxx) (bfd_get_section_flags (abfd, sec) & (flagword) ~SEC_RELOC)); +#ifdef SET_SECTION_RELOCS + SET_SECTION_RELOCS (sec, relocs, n); +#endif + #ifdef DEBUG3 { int i; @@ -1064,9 +1091,9 @@ write_relocs (abfd, sec, xxx) static void write_contents (abfd, sec, xxx) - bfd *abfd; + bfd *abfd ATTRIBUTE_UNUSED; asection *sec; - PTR xxx; + PTR xxx ATTRIBUTE_UNUSED; { segment_info_type *seginfo = seg_info (sec); unsigned long offset = 0; @@ -1095,7 +1122,7 @@ write_contents (abfd, sec, xxx) if (x == false) { bfd_perror (stdoutput->filename); - as_perror ("FATAL: Can't write %s", stdoutput->filename); + as_perror (_("FATAL: Can't write %s"), stdoutput->filename); exit (EXIT_FAILURE); } offset += f->fr_fix; @@ -1119,7 +1146,7 @@ write_contents (abfd, sec, xxx) if (x == false) { bfd_perror (stdoutput->filename); - as_perror ("FATAL: Can't write %s", stdoutput->filename); + as_perror (_("FATAL: Can't write %s"), stdoutput->filename); exit (EXIT_FAILURE); } offset += fill_size; @@ -1150,7 +1177,7 @@ write_contents (abfd, sec, xxx) buf, (file_ptr) offset, (bfd_size_type) n_per_buf * fill_size); if (x != true) - as_fatal ("Cannot write to output file."); + as_fatal (_("Cannot write to output file.")); offset += n_per_buf * fill_size; } } @@ -1309,8 +1336,8 @@ set_symtab () symp = symbol_rootP; for (i = 0; i < nsyms; i++, symp = symbol_next (symp)) { - asympp[i] = symp->bsym; - symp->written = 1; + asympp[i] = symbol_get_bfdsym (symp); + symbol_mark_written (symp); } } else @@ -1343,7 +1370,13 @@ subsegs_finish () for (frchainP = frchain_root; frchainP; frchainP = frchainP->frch_next) { subseg_set (frchainP->frch_seg, frchainP->frch_subseg); - frag_align (SUB_SEGMENT_ALIGN (now_seg), NOP_OPCODE, 0); + + /* 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. */ + frag_align (had_errors () ? 0 : SUB_SEGMENT_ALIGN (now_seg), + subseg_text_p (now_seg) ? NOP_OPCODE : 0, + 0); /* frag_align will have left a new frag. Use this last frag for an empty ".fill". @@ -1376,14 +1409,14 @@ write_object_file () if (flag_always_generate_output) { if (n_warns || n_errs) - as_warn ("%d error%s, %d warning%s, generating bad object file.\n", + 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", + 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"); } @@ -1522,6 +1555,7 @@ write_object_file () { expressionS exp; + subseg_change (lie->seg, lie->subseg); exp.X_op = O_subtract; exp.X_add_symbol = lie->add; exp.X_op_symbol = lie->sub; @@ -1566,6 +1600,7 @@ write_object_file () addressT from_addr, to_addr; int n, m; + subseg_change (lie->seg, lie->subseg); fragP = lie->dispfrag; /* Find out how many broken_words go here. */ @@ -1592,7 +1627,7 @@ write_object_file () /* This is the offset from ??? to table_ptr+0 */ to_addr = table_addr - S_GET_VALUE (lie->sub); #ifdef BFD_ASSEMBLER - to_addr -= lie->sub->sy_frag->fr_address; + to_addr -= symbol_get_frag (lie->sub)->fr_address; #endif md_number_to_chars (lie->word_goes_here, to_addr, 2); for (untruth = lie->next_broken_word; untruth && untruth->dispfrag == fragP; untruth = untruth->next_broken_word) @@ -1606,7 +1641,7 @@ write_object_file () from_addr = table_addr; to_addr = S_GET_VALUE (lie->add) + lie->addnum; #ifdef BFD_ASSEMBLER - to_addr += lie->add->sy_frag->fr_address; + 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; @@ -1739,9 +1774,9 @@ write_object_file () symbolS *symp; for (symp = symbol_rootP; symp; symp = symbol_next (symp)) - if (!symp->sy_resolved) - resolve_symbol_value (symp, 1); + resolve_symbol_value (symp, 1); } + resolve_local_symbol_values (); PROGRESS (1); @@ -1764,10 +1799,10 @@ write_object_file () int punt = 0; const char *name; - if (symp->sy_mri_common) + if (symbol_mri_common_p (symp)) { if (S_IS_EXTERNAL (symp)) - as_bad ("%s: global symbols not supported in common sections", + as_bad (_("%s: global symbols not supported in common sections"), S_GET_NAME (symp)); symbol_remove (symp, &symbol_rootP, &symbol_lastP); continue; @@ -1780,29 +1815,17 @@ 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. */ - if (! symp->sy_resolved) - { - if (symp->sy_value.X_op == O_constant) - { - /* This is the normal case; skip the call. */ - S_SET_VALUE (symp, - (S_GET_VALUE (symp) - + symp->sy_frag->fr_address)); - symp->sy_resolved = 1; - } - else - resolve_symbol_value (symp, 1); - } + resolve_symbol_value (symp, 1); /* Skip symbols which were equated to undefined or common symbols. */ - if (symp->sy_value.X_op == O_symbol + if (symbol_equated_p (symp) && (! S_IS_DEFINED (symp) || S_IS_COMMON (symp))) { symbol_remove (symp, &symbol_rootP, &symbol_lastP); @@ -1818,15 +1841,15 @@ write_object_file () printf ("symbol `%s'\n\t@%x: value=%d flags=%x seg=%s\n", S_GET_NAME (symp), symp, S_GET_VALUE (symp), - symp->bsym->flags, - segment_name (symp->bsym->section)); + symbol_get_bfdsym (symp)->flags, + segment_name (S_GET_SEGMENT (symp))); #endif #ifdef obj_frob_symbol obj_frob_symbol (symp, punt); #endif #ifdef tc_frob_symbol - if (! punt || symp->sy_used_in_reloc) + if (! punt || symbol_used_in_reloc_p (symp)) tc_frob_symbol (symp, punt); #endif @@ -1836,13 +1859,13 @@ write_object_file () 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 - && (symp->bsym->flags & BSF_SECTION_SYM) != 0) + && symbol_section_p (symp)) /* Note that S_IS_EXTERN 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) - && ! symp->sy_used_in_reloc)) + && ! symbol_used_in_reloc_p (symp))) { symbol_remove (symp, &symbol_rootP, &symbol_lastP); /* After symbol_remove, symbol_next(symp) still returns @@ -1853,16 +1876,16 @@ write_object_file () } /* Make sure we really got a value for the symbol. */ - if (! symp->sy_resolved) + 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)); - symp->sy_resolved = 1; + symbol_mark_resolved (symp); } /* Set the value into the BFD symbol. Up til now the value has only been kept in the gas symbolS struct. */ - symp->bsym->value = S_GET_VALUE (symp); + symbol_get_bfdsym (symp)->value = S_GET_VALUE (symp); } } @@ -1971,9 +1994,7 @@ relax_frag (fragP, stretch) #endif know (!(S_GET_SEGMENT (symbolP) == absolute_section) || symbolP->sy_frag == &zero_address_frag); - target += - S_GET_VALUE (symbolP) - + symbolP->sy_frag->fr_address; + target += S_GET_VALUE (symbolP) + symbol_get_frag (symbolP)->fr_address; /* If frag has yet to be reached on this pass, assume it will move by STRETCH just as we did. @@ -1984,8 +2005,8 @@ relax_frag (fragP, stretch) There should be a faster way to do this. */ - if (symbolP->sy_frag->fr_address >= was_address - && is_dnrange (fragP, symbolP->sy_frag)) + if (symbol_get_frag (symbolP)->fr_address >= was_address + && is_dnrange (fragP, symbol_get_frag (symbolP))) { target += stretch; } @@ -2099,7 +2120,7 @@ relax_segment (segment_frag_root, segment) if (offset % fragP->fr_var != 0) { - as_bad ("alignment padding (%lu bytes) not a multiple of %ld", + as_bad (_("alignment padding (%lu bytes) not a multiple of %ld"), (unsigned long) offset, (long) fragP->fr_var); offset -= (offset % fragP->fr_var); } @@ -2194,10 +2215,10 @@ relax_segment (segment_frag_root, segment) if (lie->added) continue; - offset = (lie->add->sy_frag->fr_address + offset = (symbol_get_frag (lie->add)->fr_address + S_GET_VALUE (lie->add) + lie->addnum - - (lie->sub->sy_frag->fr_address + - (symbol_get_frag (lie->sub)->fr_address + S_GET_VALUE (lie->sub))); if (offset <= -32768 || offset >= 32767) { @@ -2205,7 +2226,7 @@ relax_segment (segment_frag_root, segment) { char buf[50]; sprint_value (buf, (addressT) lie->addnum); - as_warn (".word %s-%s+%s didn't fit", + as_warn (_(".word %s-%s+%s didn't fit"), S_GET_NAME (lie->add), S_GET_NAME (lie->sub), buf); @@ -2219,8 +2240,10 @@ relax_segment (segment_frag_root, segment) for (untruth = lie->next_broken_word; untruth && untruth->dispfrag == lie->dispfrag; untruth = untruth->next_broken_word) - if ((untruth->add->sy_frag == lie->add->sy_frag) - && S_GET_VALUE (untruth->add) == S_GET_VALUE (lie->add)) + if ((symbol_get_frag (untruth->add) + == symbol_get_frag (lie->add)) + && (S_GET_VALUE (untruth->add) + == S_GET_VALUE (lie->add))) { untruth->added = 2; untruth->use_jump = lie; @@ -2270,8 +2293,8 @@ relax_segment (segment_frag_root, segment) know (!(S_GET_SEGMENT (symbolP) == SEG_ABSOLUTE) || (symbolP->sy_frag == &zero_address_frag)); #endif - target += S_GET_VALUE (symbolP) - + symbolP->sy_frag->fr_address; + target += (S_GET_VALUE (symbolP) + + symbol_get_frag (symbolP)->fr_address); } /* if we have a symbol */ know (fragP->fr_next); @@ -2282,8 +2305,16 @@ relax_segment (segment_frag_root, segment) /* Growth may be negative, but variable part of frag cannot have fewer than 0 chars. That is, we can't .org backwards. */ - as_bad ("attempt to .org backwards ignored"); - growth = 0; + as_bad_where (fragP->fr_file, fragP->fr_line, + _("attempt to .org backwards ignored")); + + /* We've issued an error message. Change the + 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; } growth -= stretch; /* This is an absolute growth factor */ @@ -2294,15 +2325,15 @@ relax_segment (segment_frag_root, segment) if (symbolP) { growth = S_GET_VALUE (symbolP); - if (symbolP->sy_frag != &zero_address_frag + if (symbol_get_frag (symbolP) != &zero_address_frag || S_IS_COMMON (symbolP) || ! S_IS_DEFINED (symbolP)) as_bad_where (fragP->fr_file, fragP->fr_line, - ".space specifies non-absolute value"); + _(".space specifies non-absolute value")); fragP->fr_symbol = 0; if (growth < 0) { - as_warn (".space or .fill with negative value, ignored"); + as_warn (_(".space or .fill with negative value, ignored")); growth = 0; } } @@ -2412,11 +2443,13 @@ fixup_segment (fixP, this_segment_type) 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; @@ -2432,12 +2465,13 @@ fixup_segment (fixP, this_segment_type) plt = fixP->fx_plt; if (add_symbolP != NULL - && add_symbolP->sy_mri_common) + && 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 = add_symbolP->sy_value.X_add_symbol; + add_symbolP = fixP->fx_addsy = + symbol_get_value_expression (add_symbolP)->X_add_symbol; } if (add_symbolP) @@ -2470,7 +2504,7 @@ fixup_segment (fixP, this_segment_type) else bad_sub_reloc: as_bad_where (fixP->fx_file, fixP->fx_line, - "Negative of non-absolute symbol %s", + _("Negative of non-absolute symbol %s"), S_GET_NAME (sub_symbolP)); } else if (S_GET_SEGMENT (sub_symbolP) == add_symbol_segment @@ -2484,7 +2518,7 @@ fixup_segment (fixP, this_segment_type) 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"); + _("callj to difference of 2 symbols")); #endif /* TC_I960 */ add_number += S_GET_VALUE (add_symbolP) - S_GET_VALUE (sub_symbolP); @@ -2550,9 +2584,12 @@ fixup_segment (fixP, this_segment_type) char buf[50]; sprint_value (buf, fragP->fr_address + where); as_bad_where (fixP->fx_file, fixP->fx_line, - "Can't emit reloc {- %s-seg symbol \"%s\"} @ file address %s.", + _("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)), - S_GET_NAME (sub_symbolP), buf); + buf); } } } @@ -2625,7 +2662,7 @@ fixup_segment (fixP, this_segment_type) * relocation. */ as_bad_where (fixP->fx_file, fixP->fx_line, - "can't use COBR format with external label"); + _("can't use COBR format with external label")); fixP->fx_addsy = NULL; fixP->fx_done = 1; continue; @@ -2645,11 +2682,15 @@ fixup_segment (fixP, this_segment_type) seg_reloc_count++; #if !(defined (TC_V850) && defined (OBJ_ELF)) #if !(defined (TC_M68K) && defined (OBJ_ELF)) +#if !(defined (TC_ARM) && defined (OBJ_ELF)) +#if !(defined (TC_I960) && defined (OBJ_ELF)) #if !defined (TC_I386) || !(defined (OBJ_ELF) || defined (OBJ_COFF)) || defined (TE_PE) add_number += S_GET_VALUE (add_symbolP); #endif #endif #endif +#endif +#endif } } } @@ -2664,33 +2705,42 @@ fixup_segment (fixP, this_segment_type) #else fixP->fx_addsy = section_symbol (absolute_section); #endif - fixP->fx_addsy->sy_used_in_reloc = 1; + 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, hibit; + valueT mask; - /* set all bits to one */ mask = 0; - mask--; - /* Technically, combining these produces an undefined result - if size is sizeof (valueT), though I think these two - half-way operations should both be defined. And the - compiler should be able to combine them if it's valid on - the host architecture. */ - mask <<= size * 4; - mask <<= size * 4; - hibit = (valueT) 1 << (size * 8 - 1); - if (((add_number & mask) != 0 - || (fixP->fx_signed - && (add_number & hibit) != 0)) - && ((add_number & mask) != mask - || (add_number & hibit) == 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); @@ -2699,7 +2749,7 @@ fixup_segment (fixP, this_segment_type) 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", + _("Value of %s too large for field of %d bytes at %s"), buf2, size, buf); } /* generic error checking */ } @@ -2711,34 +2761,15 @@ fixup_segment (fixP, this_segment_type) && 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", + _("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 (!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 - } #ifdef TC_VALIDATE_FIX - skip: ; + skip: ATTRIBUTE_UNUSED_LABEL + ; #endif #ifdef DEBUG5 fprintf (stderr, "result:\n"); @@ -2786,7 +2817,7 @@ void write_print_statistics (file) FILE *file; { - fprintf (stderr, "fixups: %d\n", n_fixups); + fprintf (file, "fixups: %d\n", n_fixups); } /* for debugging */ -- cgit v1.1