* config/tc-xtensa.c (xg_translate_idioms): Allow assembly idioms

	in FLIX instructions.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 327863d504fcaf25f125ae1d82429a62747144c9..b8591f9e2c86c9174ab3c4afad724bf668713cca 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-26  Sterling Augustine  <sterling@tensilica.com>
+       
+       * config/tc-xtensa.c (xg_translate_idioms): Allow assembly idioms
+       in FLIX instructions.
+       
 2007-03-26  Julian Brown  <julian@codesourcery.com>
 
        * config/tc-arm.c (arm_it): Add immisfloat field.

diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
index 7ef9f51372fe42b56d8ccb9afdc1d1b6eefdbd6b..2531ac99572cd71fa1152f9ad21786636791e001 100644 (file)
--- a/gas/config/tc-xtensa.c
+++ b/gas/config/tc-xtensa.c
@@ -2337,9 +2337,6 @@ xg_translate_idioms (char **popname, int *pnum_args, char **arg_strings)
   char *opname = *popname;
   bfd_boolean has_underbar = FALSE;
 
-  if (cur_vinsn.inside_bundle)
-    return 0;
-
   if (*opname == '_')
     {
       has_underbar = TRUE;
@@ -2382,7 +2379,11 @@ xg_translate_idioms (char **popname, int *pnum_args, char **arg_strings)
       return 0;
     }
 
-  if (xtensa_nop_opcode == XTENSA_UNDEFINED
+  /* Don't do anything special with NOPs inside FLIX instructions.  They
+     are handled elsewhere.  Real NOP instructions are always available 
+     in configurations with FLIX, so this should never be an issue but
+     check for it anyway.  */
+  if (!cur_vinsn.inside_bundle && xtensa_nop_opcode == XTENSA_UNDEFINED
       && strcmp (opname, "nop") == 0)
     {
       if (use_transform () && !has_underbar && density_supported)