diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a2151e5e2b..ddef913a4f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2012-02-03  Tom Tromey  <tromey@redhat.com>
+
+	PR gdb/13596:
+	* solib.h (gdb_bfd_lookup_symbol_from_symtab): Rename from
+	bfd_lookup_symbol_from_symtab.
+	* solib-pa64.c (pa64_solib_create_inferior_hook): Use
+	gdb_bfd_lookup_symbol_from_symtab.
+
 2012-02-03  Joel Brobecker  <brobecker@adacore.com>
 
 	* mi/mi-cmd-stack.c (list_args_or_locals): For argument symbols,
diff --git a/gdb/solib-pa64.c b/gdb/solib-pa64.c
index c3a0b31c97..2b8d061560 100644
--- a/gdb/solib-pa64.c
+++ b/gdb/solib-pa64.c
@@ -383,8 +383,8 @@ manpage for methods to privately map shared library text."));
 	 routine.  */
       load_addr = regcache_read_pc (get_current_regcache ())
 		  - tmp_bfd->start_address;
-      sym_addr = bfd_lookup_symbol_from_symtab (tmp_bfd, cmp_name,
-						"__dld_break");
+      sym_addr = gdb_bfd_lookup_symbol_from_symtab (tmp_bfd, cmp_name,
+						    "__dld_break");
       sym_addr = load_addr + sym_addr + 4;
       
       /* Create the shared library breakpoint.  */
diff --git a/gdb/solib.h b/gdb/solib.h
index 2c7f4d9256..7a2ff84f2c 100644
--- a/gdb/solib.h
+++ b/gdb/solib.h
@@ -86,9 +86,9 @@ extern CORE_ADDR gdb_bfd_lookup_symbol (bfd *abfd,
 
 /* Look up symbol from symbol table.  */
 
-extern CORE_ADDR bfd_lookup_symbol_from_symtab (bfd *abfd,
-						int (*match_sym) (asymbol *,
-								  void *),
-						void *data);
+extern CORE_ADDR gdb_bfd_lookup_symbol_from_symtab (bfd *abfd,
+						    int (*match_sym) (asymbol *,
+								      void *),
+						    void *data);
 
 #endif /* SOLIB_H */