2003-02-04 David Carlton <carlton@math.stanford.edu>

	* symtab.h (SYMBOL_LINKAGE_NAME): Delete.
	* printcmd.c (build_address_symbolic): Replace uses of
	SYMBOL_LINKAGE_NAME by equivalent uses of SYMBOL_SOURCE_NAME,
	SYMBOL_NAME, and asm_demangle.
	Update copyright.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2ff288a9e77e568a74970834f6a20a2f7ca6dc87..7ec013545b1d88be793a2d35f36fc1055b5b0ce8 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2003-02-04  David Carlton  <carlton@math.stanford.edu>
+
+       * symtab.h (SYMBOL_LINKAGE_NAME): Delete.
+       * printcmd.c (build_address_symbolic): Replace uses of
+       SYMBOL_LINKAGE_NAME by equivalent uses of SYMBOL_SOURCE_NAME,
+       SYMBOL_NAME, and asm_demangle.
+       Update copyright.
+
 2003-02-04  David Carlton  <carlton@math.stanford.edu>
 
        * linespec.c (decode_compound): Extract code into

diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 05b5e7152f62d1ce74b268cee8b2d9c02e833d30..657fa5ebb140623cf21215df587d9f03b9677da4 100644 (file)
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -1,7 +1,7 @@
 /* Print values for GNU debugger GDB.
 
    Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
-   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software
+   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software
    Foundation, Inc.
 
    This file is part of GDB.
@@ -639,10 +639,10 @@ build_address_symbolic (CORE_ADDR addr,  /* IN */
   if (symbol)
     {
       name_location = BLOCK_START (SYMBOL_BLOCK_VALUE (symbol));
-      if (do_demangle)
+      if (do_demangle || asm_demangle)
        name_temp = SYMBOL_SOURCE_NAME (symbol);
       else
-       name_temp = SYMBOL_LINKAGE_NAME (symbol);
+       name_temp = SYMBOL_NAME (symbol);
     }
 
   if (msymbol != NULL)
@@ -654,10 +654,10 @@ build_address_symbolic (CORE_ADDR addr,  /* IN */
          symbol = 0;
          symtab = 0;
          name_location = SYMBOL_VALUE_ADDRESS (msymbol);
-         if (do_demangle)
+         if (do_demangle || asm_demangle)
            name_temp = SYMBOL_SOURCE_NAME (msymbol);
          else
-           name_temp = SYMBOL_LINKAGE_NAME (msymbol);
+           name_temp = SYMBOL_NAME (msymbol);
        }
     }
   if (symbol == NULL && msymbol == NULL)

diff --git a/gdb/symtab.h b/gdb/symtab.h
index b21081d9e919a7af89d091388b88a6c8e31937a7..2c839293e53d879fea2d72ca9acc30dc9eccd01a 100644 (file)
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -178,17 +178,6 @@ extern char *symbol_demangled_name (struct general_symbol_info *symbol);
    ? SYMBOL_DEMANGLED_NAME (symbol)                                    \
    : SYMBOL_NAME (symbol))
 
-/* Macro that returns the "natural assembly name" of a symbol.  In C++ this is
-   the "mangled" form of the name if demangle is off, or if demangle is on and
-   asm_demangle is off.  Otherwise if asm_demangle is on it is the "demangled"
-   form.  In other languages this is just the symbol name.  The result should
-   never be NULL. */
-
-#define SYMBOL_LINKAGE_NAME(symbol)                                    \
-  (demangle && asm_demangle && SYMBOL_DEMANGLED_NAME (symbol) != NULL  \
-   ? SYMBOL_DEMANGLED_NAME (symbol)                                    \
-   : SYMBOL_NAME (symbol))
-
 /* Macro that tests a symbol for a match against a specified name string.
    First test the unencoded name, then looks for and test a C++ encoded
    name if it exists.  Note that whitespace is ignored while attempting to