* config/m68k/monitor.mt (TDEPFILE): Add remote-es.o.

[deliverable/binutils-gdb.git] / gdb / demangle.c

diff --git a/gdb/demangle.c b/gdb/demangle.c
index e7c835646fc1457daba727a5f32dcb8af5f2566c..bf7ee47249ffbf3da0fb8ebeb3ba36535614df9e 100644 (file)
--- a/gdb/demangle.c
+++ b/gdb/demangle.c
@@ -31,7 +31,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Select the default C++ demangling style to use.  The default is "auto",
    which allows gdb to attempt to pick an appropriate demangling style for
    the executable it has loaded.  It can be set to a specific style ("gnu",
-   "lucid", "cfront", etc.) in which case gdb will never attempt to do auto
+   "lucid", "arm", etc.) in which case gdb will never attempt to do auto
    selection of the style unless you do an explicit "set demangle auto".
    To select one of these as the default, set DEFAULT_DEMANGLING_STYLE in
    the appropriate target configuration file. */
@@ -64,10 +64,10 @@ static const struct demangler
   {LUCID_DEMANGLING_STYLE_STRING,
      lucid_demangling,
      "Lucid (lcc) style demangling"},
-  {CFRONT_DEMANGLING_STYLE_STRING,
-     cfront_demangling,
-     "ARM (cfront) style demangling"},
-  {NULL, 0, NULL}
+  {ARM_DEMANGLING_STYLE_STRING,
+     arm_demangling,
+     "ARM style demangling"},
+  {NULL, unknown_demangling, NULL}
 };
 
 /* show current demangling style. */
@@ -111,8 +111,8 @@ set_demangling_command (ignore, from_tty)
 
   for (dem = demanglers; dem -> demangling_style_name != NULL; dem++)
     {
-      if (strcmp (current_demangling_style_string,
-                 dem -> demangling_style_name) == 0)
+      if (STREQ (current_demangling_style_string,
+                 dem -> demangling_style_name))
        {
          current_demangling_style = dem -> demangling_style;
          break;
@@ -127,13 +127,13 @@ set_demangling_command (ignore, from_tty)
     {
       if (*current_demangling_style_string != '\0')
        {
-         printf ("Unknown demangling style `%s'.\n",
+         printf_unfiltered ("Unknown demangling style `%s'.\n",
                  current_demangling_style_string);
        }
-      printf ("The currently understood settings are:\n\n");
+      printf_unfiltered ("The currently understood settings are:\n\n");
       for (dem = demanglers; dem -> demangling_style_name != NULL; dem++)
        {
-         printf ("%-10s %s\n", dem -> demangling_style_name,
+         printf_unfiltered ("%-10s %s\n", dem -> demangling_style_name,
                  dem -> demangling_style_doc);
          if (dem -> demangling_style == current_demangling_style)
            {
@@ -177,7 +177,8 @@ _initialize_demangler ()
 
    set = add_set_cmd ("demangle-style", class_support, var_string_noescape,
                      (char *) &current_demangling_style_string,
-                     "Set the current C++ demangling style.",
+                     "Set the current C++ demangling style.\n\
+Use `set demangle-style' without arguments for a list of demangling styles.",
                      &setlist);
    show = add_show_from_set (set, &showlist);
    set -> function.cfunc = set_demangling_command;