reverse-finish: turn internal error into normal error

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

diff --git a/gdb/solib-irix.c b/gdb/solib-irix.c
index 0dbbb1bd1b1b2a95659bbcf0870b57f24cdd9f1c..9c0838f1032be061bb19cdc13ed7a62e8bc7d862 100644 (file)
--- a/gdb/solib-irix.c
+++ b/gdb/solib-irix.c
@@ -1,5 +1,5 @@
 /* Shared library support for IRIX.
-   Copyright (C) 1993-2013 Free Software Foundation, Inc.
+   Copyright (C) 1993-2014 Free Software Foundation, Inc.
 
    This file was created using portions of irix5-nat.c originally
    contributed to GDB by Ian Lance Taylor.
@@ -30,6 +30,7 @@
 #include "gdbcore.h"
 #include "target.h"
 #include "inferior.h"
+#include "infrun.h"
 #include "gdbthread.h"
 
 #include "solist.h"
@@ -281,13 +282,13 @@ static CORE_ADDR debug_base;      /* Base of dynamic linker structures.  */
 static CORE_ADDR
 locate_base (void)
 {
-  struct minimal_symbol *msymbol;
+  struct bound_minimal_symbol msymbol;
   CORE_ADDR address = 0;
 
   msymbol = lookup_minimal_symbol (DEBUG_BASE, NULL, symfile_objfile);
-  if ((msymbol != NULL) && (SYMBOL_VALUE_ADDRESS (msymbol) != 0))
+  if ((msymbol.minsym != NULL) && (BMSYMBOL_VALUE_ADDRESS (msymbol) != 0))
     {
-      address = SYMBOL_VALUE_ADDRESS (msymbol);
+      address = BMSYMBOL_VALUE_ADDRESS (msymbol);
     }
   return (address);
 }