From: Elena Zannoni <ezannoni@kwikemart.cygnus.com>
Date: Thu, 16 Oct 2003 16:35:27 +0000 (+0000)
Subject: 2003-10-16  Elena Zannoni  <ezannoni@redhat.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=40324f1b404edf73cafbf8c6c7deb017a4623ba8;p=binutils-gdb.git

2003-10-16  Elena Zannoni  <ezannoni@redhat.com>

	* minsyms.c (lookup_minimal_symbol_solib_trampoline): Remove
	second parameter, which is always null. Remove
	SOFUN_ADDRESS_MAYBE_MISSING ifdeffed code.
	* symtab.h (lookup_minimal_symbol_solib_trampoline): Update
	accordingly.
	* somsolib.c (som_solib_create_inferior_hook,
	som_solib_desire_dynamic_linker_symbols): Update callers.
	* hppa-tdep.c (hppa_fix_call_dummy): Ditto.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4767e2bf754..3834c5481ee 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2003-10-16  Elena Zannoni  <ezannoni@redhat.com>
+
+	* minsyms.c (lookup_minimal_symbol_solib_trampoline): Remove
+	second parameter, which is always null. Remove
+	SOFUN_ADDRESS_MAYBE_MISSING ifdeffed code.
+	* symtab.h (lookup_minimal_symbol_solib_trampoline): Update
+	accordingly.
+	* somsolib.c (som_solib_create_inferior_hook,
+	som_solib_desire_dynamic_linker_symbols): Update callers.
+	* hppa-tdep.c (hppa_fix_call_dummy): Ditto.
 
 2003-10-16  Kei Sakamoto  <sakamoto.kei@renesas.com>
 
diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index e5a18909f14..c168b5d61c6 100644
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -2376,7 +2376,7 @@ hppa_fix_call_dummy (char *dummy, CORE_ADDR pc, CORE_ADDR fun, int nargs,
 	  {
 	    stub_symbol
 	      = lookup_minimal_symbol_solib_trampoline
-	      (DEPRECATED_SYMBOL_NAME (funsymbol), NULL, objfile);
+	      (DEPRECATED_SYMBOL_NAME (funsymbol), objfile);
 
 	    if (!stub_symbol)
 	      stub_symbol = lookup_minimal_symbol (DEPRECATED_SYMBOL_NAME (funsymbol),
diff --git a/gdb/minsyms.c b/gdb/minsyms.c
index e4fd60d0b10..d93a697e140 100644
--- a/gdb/minsyms.c
+++ b/gdb/minsyms.c
@@ -346,7 +346,6 @@ lookup_minimal_symbol_text (const char *name, const char *sfile,
 
 struct minimal_symbol *
 lookup_minimal_symbol_solib_trampoline (const char *name,
-					const char *sfile,
 					struct objfile *objf)
 {
   struct objfile *objfile;
@@ -355,15 +354,6 @@ lookup_minimal_symbol_solib_trampoline (const char *name,
 
   unsigned int hash = msymbol_hash (name) % MINIMAL_SYMBOL_HASH_SIZE;
 
-#ifdef SOFUN_ADDRESS_MAYBE_MISSING
-  if (sfile != NULL)
-    {
-      char *p = strrchr (sfile, '/');
-      if (p != NULL)
-	sfile = p + 1;
-    }
-#endif
-
   for (objfile = object_files;
        objfile != NULL && found_symbol == NULL;
        objfile = objfile->next)
diff --git a/gdb/somsolib.c b/gdb/somsolib.c
index ed54ad089ad..e013fd88d38 100644
--- a/gdb/somsolib.c
+++ b/gdb/somsolib.c
@@ -937,7 +937,7 @@ som_solib_create_inferior_hook (void)
 
     /* What a crock.  */
     msymbol2 = lookup_minimal_symbol_solib_trampoline (DEPRECATED_SYMBOL_NAME (msymbol),
-						       NULL, objfile);
+						       objfile);
     /* Found a symbol with the right name.  */
     if (msymbol2)
       {
@@ -1225,7 +1225,6 @@ som_solib_desire_dynamic_linker_symbols (void)
       }
 
     dld_msymbol = lookup_minimal_symbol_solib_trampoline ("shl_load",
-							  NULL,
 							  objfile);
     if (dld_msymbol != NULL)
       {
@@ -1265,7 +1264,6 @@ som_solib_desire_dynamic_linker_symbols (void)
       }
 
     dld_msymbol = lookup_minimal_symbol_solib_trampoline ("shl_unload",
-							  NULL,
 							  objfile);
     if (dld_msymbol != NULL)
       {
diff --git a/gdb/symtab.h b/gdb/symtab.h
index da301254749..3723559cbc3 100644
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -1168,7 +1168,6 @@ extern struct minimal_symbol *lookup_minimal_symbol_text (const char *,
 							  struct objfile *);
 
 struct minimal_symbol *lookup_minimal_symbol_solib_trampoline (const char *,
-							       const char *,
 							       struct objfile
 							       *);