From 406fc7fbebc6e4493f0fc348c434d01c7bde2d9b Mon Sep 17 00:00:00 2001 From: David Carlton Date: Tue, 4 Feb 2003 21:37:03 +0000 Subject: 2003-02-04 David Carlton * 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. --- gdb/printcmd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gdb/printcmd.c') diff --git a/gdb/printcmd.c b/gdb/printcmd.c index 05b5e71..657fa5e 100644 --- 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) -- cgit v1.1