* solib.c (solib_global_lookup): Use solib_ops instead of global

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

diff --git a/gdb/solib.c b/gdb/solib.c
index bd4cf5175517cd9203ff7a6195cf1497ee6ec019..f687558180fa9c680b53f4992b1f92250707530f 100644 (file)
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -7,7 +7,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 
@@ -854,7 +852,7 @@ clear_solib (void)
      So: disable breakpoints only if we're using ELF shared libs.  */
   if (exec_bfd != NULL
       && bfd_get_flavour (exec_bfd) != bfd_target_aout_flavour)
-    disable_breakpoints_in_shlibs (1);
+    disable_breakpoints_in_shlibs ();
 
   while (so_list_head)
     {
@@ -987,10 +985,11 @@ solib_global_lookup (const struct objfile *objfile,
                     const domain_enum domain,
                     struct symtab **symtab)
 {
-  if (current_target_so_ops->lookup_lib_global_symbol != NULL)
-    return current_target_so_ops->lookup_lib_global_symbol (objfile,
-                               name, linkage_name, domain, symtab);
+  struct target_so_ops *ops = solib_ops (current_gdbarch);
 
+  if (ops->lookup_lib_global_symbol != NULL)
+    return ops->lookup_lib_global_symbol (objfile, name, linkage_name,
+                                         domain, symtab);
   return NULL;
 }