diff options
| author | Alan Modra <amodra@gmail.com> | 2001-07-23 13:03:40 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2001-07-23 13:03:40 +0000 |
| commit | ac62c3468da474862067776e9cda6fb291aa53cf (patch) | |
| tree | 6d2417c71e130ce8bd652b102de524254cd5a360 /gas/config/tc-cris.c | |
| parent | 677537c186644c0b7ad48edcb759ea29d6c4f80e (diff) | |
| download | fsf-binutils-gdb-ac62c3468da474862067776e9cda6fb291aa53cf.zip fsf-binutils-gdb-ac62c3468da474862067776e9cda6fb291aa53cf.tar.gz fsf-binutils-gdb-ac62c3468da474862067776e9cda6fb291aa53cf.tar.bz2 | |
* symbols.c (S_GET_VALUE): Don't treat O_constant and local
symbols specially. Always resolve, adding fr_address to value.
* write.c (write_object_file): Don't add fr_address to sym values.
(relax_frag): Likewise.
(relax_segment): Likewise.
* config/obj-ieee.c (do_symbols): Likewise.
* config/tc-cris.c (md_convert_frag): Likewise.
* config/tc-fr30.c (md_convert_frag): Likewise.
* config/tc-i386.c (md_convert_frag): Likewise.
* config/tc-m32r.c (md_convert_frag): Likewise.
* config/tc-m68hc11.c (md_convert_frag): Likewise.
* config/tc-mcore.c (md_convert_frag): Likewise.
* config/tc-mips.c (mips16_extended_frag): Likewise.
* config/tc-ns32k.c (md_convert_frag): Likewise.
* config/tc-m68k.c (md_convert_frag_1): Likewise.
(BRANCHBWL, BRABSJUNC, BRABSJCOND, BRANCHBW, FBRANCH, DBCCLBR,
DBCCABSJ, PCREL1632, PCINDEX, ABSTOPCREL): Decrement.
(md_relax_table): Remove first four entries. Format.
(md_estimate_size_before_relax): Remove old_fix. Don't bother
setting fr_var. Simplify byte branch checks.
Diffstat (limited to 'gas/config/tc-cris.c')
| -rw-r--r-- | gas/config/tc-cris.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/gas/config/tc-cris.c b/gas/config/tc-cris.c index 19ae971..a83cf8a 100644 --- a/gas/config/tc-cris.c +++ b/gas/config/tc-cris.c @@ -495,10 +495,7 @@ md_convert_frag (abfd, sec, fragP) opcodep = fragP->fr_opcode; symbolP = fragP->fr_symbol; - target_address - = (symbolP - ? S_GET_VALUE (symbolP) + symbol_get_frag(fragP->fr_symbol)->fr_address - : 0 ) + fragP->fr_offset; + target_address = (symbolP ? S_GET_VALUE (symbolP) : 0) + fragP->fr_offset; address_of_var_part = fragP->fr_address + var_part_offset; switch (fragP->fr_subtype) |