From: David Carlton <carlton@bactrian.org>
Date: Fri, 2 May 2003 20:36:08 +0000 (+0000)
Subject: 2003-05-02  David Carlton  <carlton@bactrian.org>
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fcc3ea19593cfcbcdd5f4a241fb206f0fe7edd48;p=thirdparty%2Fbinutils-gdb.git

2003-05-02  David Carlton  <carlton@bactrian.org>

	* minsyms.c: Delete declarations for lookup_minimal_symbol_linkage
	and lookup_minimal_symbol_natural.
	* linespec.c (decode_variable): Call
	lookup_minimal_symbol_linkage_or_natural instead of
	lookup_minimal_symbol.
	(decode_dollar): Ditto.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f712b7ea94f..20cbf088309 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2003-05-02  David Carlton  <carlton@bactrian.org>
+
+	* minsyms.c: Delete declarations for lookup_minimal_symbol_linkage
+	and lookup_minimal_symbol_natural.
+	* linespec.c (decode_variable): Call
+	lookup_minimal_symbol_linkage_or_natural instead of
+	lookup_minimal_symbol.
+	(decode_dollar): Ditto.
+
 2003-05-02  David Carlton  <carlton@bactrian.org>
 
 	* config/djgpp/fnchange.lst: Add testsuite/gdb.c++/rtti files.
diff --git a/gdb/linespec.c b/gdb/linespec.c
index 2a4d0c02cfb..1f0d65fbe7a 100644
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -1665,7 +1665,7 @@ decode_dollar (char **argptr, int funfirstline, struct symtab *default_symtab,
 			     sym, NULL, sym_symtab);
 
       /* If symbol was not found, look in minimal symbol tables.  */
-      msymbol = lookup_minimal_symbol (copy, NULL, NULL);
+      msymbol = lookup_minimal_symbol_linkage_or_natural (copy);
       if (msymbol != NULL)
 	return minsym_found (funfirstline, msymbol);
 
@@ -1762,7 +1762,7 @@ decode_variable (char **argptr, int funfirstline, char ***canonical,
 			   sym, file_symtab, sym_symtab);
     }
 
-  msymbol = lookup_minimal_symbol (copy, NULL, NULL);
+  msymbol = lookup_minimal_symbol_linkage_or_natural (copy);
 
   if (msymbol != NULL)
     return minsym_found (funfirstline, msymbol);
diff --git a/gdb/minsyms.c b/gdb/minsyms.c
index 7739381fa02..f4f75e7d393 100644
--- a/gdb/minsyms.c
+++ b/gdb/minsyms.c
@@ -76,16 +76,6 @@ static int msym_bunch_index;
 
 static int msym_count;
 
-static struct minimal_symbol *lookup_minimal_symbol_linkage (const char *name,
-							     const char *sfile,
-							     struct objfile
-							     *objf);
-
-static struct minimal_symbol *lookup_minimal_symbol_natural (const char *name,
-							     const char *sfile,
-							     struct objfile
-							     *objf);
-
 static struct minimal_symbol *lookup_minimal_symbol_aux (const char *name,
 							 int linkage,
 							 const char *sfile,