diff options
| -rw-r--r-- | gas/ChangeLog | 9 | ||||
| -rw-r--r-- | gas/write.c | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index ac2e3d7..8b78037 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,12 @@ +2019-10-25 Alan Modra <amodra@gmail.com> + + PR gas/25125 + PR gas/12049 + * write.c (relax_frag): Correct calculation of delta for + positive branches where "stretch" would make the branch + negative. Return zero immediately in that case. Correct + TC_PCREL_ADJUST comment. + 2019-10-16 Alan Modra <amodra@gmail.com> * config/tc-xtensa.c (xg_order_trampoline_chain_entry): Don't diff --git a/gas/write.c b/gas/write.c index 9b5ae6f..8f7786e 100644 --- a/gas/write.c +++ b/gas/write.c @@ -2497,7 +2497,7 @@ relax_frag (segT segment, fragS *fragP, long stretch) const relax_typeS *table; target = fragP->fr_offset; - address = fragP->fr_address; + address = fragP->fr_address + fragP->fr_fix; table = TC_GENERIC_RELAX_TABLE; this_state = fragP->fr_subtype; start_type = this_type = table + this_state; @@ -2537,13 +2537,13 @@ relax_frag (segT segment, fragS *fragP, long stretch) negative. Don't allow this in case the negative reach is large enough to require a larger branch instruction. */ else if (target < address) - target = fragP->fr_next->fr_address + stretch; + return 0; } } - aim = target - address - fragP->fr_fix; + aim = target - address; #ifdef TC_PCREL_ADJUST - /* Currently only the ns32k family needs this. */ + /* Currently only the ns32k and arc needs this. */ aim += TC_PCREL_ADJUST (fragP); #endif |