diff options
| author | Bob Wilson <bob.wilson@acm.org> | 2005-04-22 21:37:31 +0000 |
|---|---|---|
| committer | Bob Wilson <bob.wilson@acm.org> | 2005-04-22 21:37:31 +0000 |
| commit | d2a033cd2aceea6db7fce8fd943c7eedae770fb1 (patch) | |
| tree | 7df80f78c05329905eb070fd2f255a78a0ec39dd /gas | |
| parent | a07ff70c94c615346c0f7093431624dacb9bbe95 (diff) | |
| download | gdb-d2a033cd2aceea6db7fce8fd943c7eedae770fb1.zip gdb-d2a033cd2aceea6db7fce8fd943c7eedae770fb1.tar.gz gdb-d2a033cd2aceea6db7fce8fd943c7eedae770fb1.tar.bz2 | |
* config/tc-xtensa.c (LOOKAHEAD_ALIGNER): Delete macro.
(future_alignment_required): Remove ifdefs that use it.
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/config/tc-xtensa.c | 14 |
2 files changed, 8 insertions, 11 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 412383a..1747b10 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,5 +1,10 @@ 2005-04-22 Bob Wilson <bob.wilson@acm.org> + * config/tc-xtensa.c (LOOKAHEAD_ALIGNER): Delete macro. + (future_alignment_required): Remove ifdefs that use it. + +2005-04-22 Bob Wilson <bob.wilson@acm.org> + * config/tc-xtensa.c (xg_get_build_instr_size): Remove. (xg_is_narrow_insn, xg_expand_narrow): Remove. Merge into... (xg_is_single_relaxable_insn): ...here. Add "targ" and "narrow_only" diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c index ec850d2..663c531 100644 --- a/gas/config/tc-xtensa.c +++ b/gas/config/tc-xtensa.c @@ -8492,11 +8492,6 @@ find_address_of_next_align_frag (fragS **fragPP, static long bytes_to_stretch (fragS *, int, int, int, int); -/* Undefine LOOKAHEAD_ALIGNER to get the older behavior. - I'll leave this in until I am more confident this works. */ - -#define LOOKAHEAD_ALIGNER 1 - static long future_alignment_required (fragS *fragP, long stretch ATTRIBUTE_UNUSED) { @@ -8524,7 +8519,7 @@ future_alignment_required (fragS *fragP, long stretch ATTRIBUTE_UNUSED) assert (max_diff >= opt_diff); if (max_diff == 0) return 0; -#ifdef LOOKAHEAD_ALIGNER + if (fragP) fragP = fragP->fr_next; @@ -8573,7 +8568,7 @@ future_alignment_required (fragS *fragP, long stretch ATTRIBUTE_UNUSED) fragP = fragP->fr_next; } } -#endif /* LOOKAHEAD_ALIGNER */ + /* If there are enough wideners in between, do it. */ if (paddable) { @@ -8587,7 +8582,6 @@ future_alignment_required (fragS *fragP, long stretch ATTRIBUTE_UNUSED) local_stretch_amount = bytes_to_stretch (this_frag, wide_nops, narrow_nops, num_widens, local_opt_diff); -#ifdef LOOKAHEAD_ALIGNER global_stretch_amount = bytes_to_stretch (this_frag, wide_nops, narrow_nops, num_widens, opt_diff); @@ -8599,9 +8593,7 @@ future_alignment_required (fragS *fragP, long stretch ATTRIBUTE_UNUSED) stretch_amount = local_stretch_amount; else stretch_amount = global_stretch_amount; -#else /* ! LOOKAHEAD_ALIGNER */ - stretch_amount = local_stretch_amount; -#endif /* ! LOOKAHEAD_ALIGNER */ + if (this_frag->fr_subtype == RELAX_SLOTS && this_frag->tc_frag_data.slot_subtypes[0] == RELAX_NARROW) assert (stretch_amount <= 1); |