diff options
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/config/tc-xtensa.c | 12 |
2 files changed, 12 insertions, 5 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 60a39b4..d34e601 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2009-08-17 Sterling Augustine <sterling@jaw.hq.tensilica.com> + + * config/tc-xtensa.c (xtensa_frob_label): move call to + do_align_targets to set frag_type only. + 2009-08-17 Kai Tietz <kai.tietz@onevision.com> * config/obj-coff-seh.c: New file. diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c index bacd54b..9131c7f 100644 --- a/gas/config/tc-xtensa.c +++ b/gas/config/tc-xtensa.c @@ -5210,16 +5210,18 @@ xtensa_frob_label (symbolS *sym) /* No target aligning in the absolute section. */ if (now_seg != absolute_section - && do_align_targets () && !is_unaligned_label (sym) && !generating_literals) { xtensa_set_frag_assembly_state (frag_now); - frag_var (rs_machine_dependent, - 0, (int) freq, - RELAX_DESIRE_ALIGN_IF_TARGET, - frag_now->fr_symbol, frag_now->fr_offset, NULL); + if (do_align_targets ()) + frag_var (rs_machine_dependent, 0, (int) freq, + RELAX_DESIRE_ALIGN_IF_TARGET, frag_now->fr_symbol, + frag_now->fr_offset, NULL); + else + frag_var (rs_fill, 0, 0, frag_now->fr_subtype, + frag_now->fr_symbol, frag_now->fr_offset, NULL); xtensa_set_frag_assembly_state (frag_now); xtensa_move_labels (frag_now, 0); } |