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 4767e2bf754fb2d924e7cff35195e312f6b76425..3834c5481eecd3439b3c0c0d9ec899e2793e15ac 100644 (file)
--- 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 e5a18909f141a8601e14c2fe2e487be53b951f97..c168b5d61c620a092fb41634b80f27921ee6fbb9 100644 (file)
--- 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 e4fd60d0b1099d5ea93d44322103b558960d91c7..d93a697e14057d3a7313fe7aaca01feae2145181 100644 (file)
--- 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 ed54ad089ad551afb42e0e47349cb1b16e3dd1f4..e013fd88d3803a6077cdd1c95188fa2677652dbf 100644 (file)
--- 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 da301254749e54bd328fca28edca88bd0b7b06fb..3723559cbc3bb8a6df6480203314db1f2cc85f79 100644 (file)
--- 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
                                                               *);