* config/tc-xtensa.c (emit_single_op): Do not relax MOVI

	instructions when such transformations have been disabled.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 6bc2da982d01b1066655fb0c1cedef76b5bb9404..e7425364fbbae14162f00b0f8d1c16f19dbb5498 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-14  Sterling Augustine  <sterling@tensilica.com>
+
+       * config/tc-xtensa.c (emit_single_op): Do not relax MOVI
+       instructions when such transformations have been disabled.
+
 2006-04-10  Sterling Augustine  <sterling@tensilica.com>
 
        * config/tc-xtensa.c (xg_assemble_vliw_tokens): Record loop target

diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
index 56902e1fadf5c80f3734052430f4bb697ebd3de8..6cbecef20ed35ff693dde72feac24301bfdb5510 100644 (file)
--- a/gas/config/tc-xtensa.c
+++ b/gas/config/tc-xtensa.c
@@ -6573,7 +6573,8 @@ emit_single_op (TInsn *orig_insn)
        || orig_insn->opcode == xtensa_movi_n_opcode)
       && !cur_vinsn.inside_bundle
       && (orig_insn->tok[1].X_op == O_symbol
-         || orig_insn->tok[1].X_op == O_pltrel))
+         || orig_insn->tok[1].X_op == O_pltrel)
+      && !orig_insn->is_specific_opcode && use_transform ())
     xg_assembly_relax (&istack, orig_insn, now_seg, frag_now, 0, 1, 0);
   else
     if (xg_expand_assembly_insn (&istack, orig_insn))