* config/tc-xtensa.c (xg_translate_sysreg_op): Remove has_underbar

	flag and avoid double underscore prefixes.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 1b72e39dc7f22cf8bf4c930ab000a6e715b0bdb8..c3a83c332421d2688cbaa0f50b3ae14f87c782a3 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-13  Bob Wilson  <bob.wilson@acm.org>
+
+       * config/tc-xtensa.c (xg_translate_sysreg_op): Remove has_underbar
+       flag and avoid double underscore prefixes.
+
 2006-03-10  Paul Brook  <paul@codesourcery.com>
 
        * config/tc-arm.c (md_begin): Handle EABIv5.

diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
index 8c841726cdb99429c7fff08f74add4de35a8421c..5a7f202335f5c5fdefca1ff334b5dbd23d006863 100644 (file)
--- a/gas/config/tc-xtensa.c
+++ b/gas/config/tc-xtensa.c
@@ -2180,14 +2180,10 @@ xg_translate_sysreg_op (char **popname, int *pnum_args, char **arg_strings)
   char *opname, *new_opname;
   const char *sr_name;
   int is_user, is_write;
-  bfd_boolean has_underbar = FALSE;
 
   opname = *popname;
   if (*opname == '_')
-    {
-      has_underbar = TRUE;
-      opname += 1;
-    }
+    opname += 1;
   is_user = (opname[1] == 'u');
   is_write = (opname[0] == 'w');
 
@@ -2233,8 +2229,7 @@ xg_translate_sysreg_op (char **popname, int *pnum_args, char **arg_strings)
   if (is_write && !is_user && !strcasecmp ("interrupt", sr_name))
     sr_name = "intset";
   new_opname = (char *) xmalloc (strlen (sr_name) + 6);
-  sprintf (new_opname, "%s%s.%s", (has_underbar ? "_" : ""),
-          *popname, sr_name);
+  sprintf (new_opname, "%s.%s", *popname, sr_name);
   free (*popname);
   *popname = new_opname;