*** empty log message ***

[deliverable/binutils-gdb.git] / gdb / somsolib.c

diff --git a/gdb/somsolib.c b/gdb/somsolib.c
index c66946bfb7de2bcd5081ff4e9cb47fe13f938e6f..b2a833cbada33e39a7d9f9f023e8ae934a093f02 100644 (file)
--- a/gdb/somsolib.c
+++ b/gdb/somsolib.c
@@ -41,6 +41,8 @@
 #include "gdbcmd.h"
 #include "language.h"
 #include "regcache.h"
+#include "gdb_assert.h"
+#include "exec.h"
 
 #include <fcntl.h>
 
@@ -54,10 +56,6 @@
 /* #define SOLIB_DEBUG
  */
 
-/* Defined in exec.c; used to prevent dangling pointer bug.
- */
-extern struct target_ops exec_ops;
-
 /* This lives in hppa-tdep.c. */
 extern struct unwind_table_entry *find_unwind_entry (CORE_ADDR pc);
 
@@ -73,9 +71,6 @@ extern struct unwind_table_entry *find_unwind_entry (CORE_ADDR pc);
 
 /* TODO:
 
-   * Most of this code should work for hp300 shared libraries.  Does
-   anyone care enough to weed out any SOM-isms.
-
    * Support for hpux8 dynamic linker.  */
 
 /* The basic structure which describes a dynamically loaded object.  This
@@ -938,8 +933,8 @@ som_solib_create_inferior_hook (void)
     struct minimal_symbol *msymbol2;
 
     /* What a crock.  */
-    msymbol2 = lookup_minimal_symbol_solib_trampoline (SYMBOL_NAME (msymbol),
-                                                      NULL, objfile);
+    msymbol2 = lookup_minimal_symbol_solib_trampoline (DEPRECATED_SYMBOL_NAME (msymbol),
+                                                      objfile);
     /* Found a symbol with the right name.  */
     if (msymbol2)
       {
@@ -1227,7 +1222,6 @@ som_solib_desire_dynamic_linker_symbols (void)
       }
 
     dld_msymbol = lookup_minimal_symbol_solib_trampoline ("shl_load",
-                                                         NULL,
                                                          objfile);
     if (dld_msymbol != NULL)
       {
@@ -1267,7 +1261,6 @@ som_solib_desire_dynamic_linker_symbols (void)
       }
 
     dld_msymbol = lookup_minimal_symbol_solib_trampoline ("shl_unload",
-                                                         NULL,
                                                          objfile);
     if (dld_msymbol != NULL)
       {