This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
clean up some ifdefs in Xtensa GAS code
- From: Bob Wilson <bwilson at tensilica dot com>
- To: binutils at sources dot redhat dot com
- Date: Fri, 22 Apr 2005 14:40:27 -0700
- Subject: clean up some ifdefs in Xtensa GAS code
- Organization: Tensilica, Inc.
Another Xtensa GAS cleanup patch. Committed on mainline.
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.
Index: config/tc-xtensa.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-xtensa.c,v
retrieving revision 1.35
diff -u -p -r1.35 tc-xtensa.c
--- config/tc-xtensa.c 22 Apr 2005 20:21:59 -0000 1.35
+++ config/tc-xtensa.c 22 Apr 2005 21:08:42 -0000
@@ -8492,11 +8492,6 @@ find_address_of_next_align_frag (fragS *
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,
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,
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,
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,
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);