aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Carlton <carlton@bactrian.org>2003-02-20 22:07:38 +0000
committerDavid Carlton <carlton@bactrian.org>2003-02-20 22:07:38 +0000
commitb1262a0293589a61291263eef2d35a6e007f1760 (patch)
tree07372b2610a03b21c281b7c777d4012b19d706c8
parent36ffb0410624c064c457b8b1f6e5465d60d7e1c3 (diff)
downloadgdb-b1262a0293589a61291263eef2d35a6e007f1760.zip
gdb-b1262a0293589a61291263eef2d35a6e007f1760.tar.gz
gdb-b1262a0293589a61291263eef2d35a6e007f1760.tar.bz2
2003-02-20 David Carlton <carlton@math.stanford.edu>
* symtab.c (search_symbols): Revert the search_symbols part of my 2002-12-23 patch. Add comment.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/symtab.c37
2 files changed, 17 insertions, 25 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4c6dfd2..25f6123 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-20 David Carlton <carlton@math.stanford.edu>
+
+ * symtab.c (search_symbols): Revert the search_symbols part of my
+ 2002-12-23 patch. Add comment.
+
2002-02-20 Daniel Jacobowitz <drow@mvista.com>
* coffread.c (coff_symfile_read): Clean up minimal symbols earlier.
diff --git a/gdb/symtab.c b/gdb/symtab.c
index c3c6d7f..9ee05e5 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -2956,31 +2956,18 @@ search_symbols (char *regexp, namespace_enum kind, int nfiles, char *files[],
{
if (0 == find_pc_symtab (SYMBOL_VALUE_ADDRESS (msymbol)))
{
- if (kind == FUNCTIONS_NAMESPACE)
- {
- found_misc = 1;
- }
- else
- {
- struct symbol *sym;
-
- if (SYMBOL_DEMANGLED_NAME (msymbol) != NULL)
- sym
- = lookup_symbol_aux_minsyms (SYMBOL_DEMANGLED_NAME
- (msymbol),
- SYMBOL_NAME (msymbol),
- VAR_NAMESPACE,
- NULL, NULL);
- else
- sym
- = lookup_symbol_aux_minsyms (SYMBOL_NAME (msymbol),
- NULL,
- VAR_NAMESPACE,
- NULL, NULL);
-
- if (sym == NULL)
- found_misc = 1;
- }
+ /* FIXME: carlton/2003-02-04: Given that the
+ semantics of lookup_symbol keeps on changing
+ slightly, it would be a nice idea if we had a
+ function lookup_symbol_minsym that found the
+ symbol associated to a given minimal symbol (if
+ any). */
+ if (kind == FUNCTIONS_NAMESPACE
+ || lookup_symbol (SYMBOL_NAME (msymbol),
+ (struct block *) NULL,
+ VAR_NAMESPACE,
+ 0, (struct symtab **) NULL) == NULL)
+ found_misc = 1;
}
}
}