* irix5-nat.c, osfsolib.c (solib_address): Return the name of the

	containing solib.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 55fc40edd1f3e5e820d2d5c2ce9f64973c932fb9..3ea7549d700c53d9ee3724f4ace5b8906fad567d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Sun Nov 19 05:20:53 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+       * irix5-nat.c, osfsolib.c (solib_address):  Return the name of the
+       containing solib.
+
 Sat Nov 18 11:19:35 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
        * solib.c (solib_address): Return the name of the containing solib.

diff --git a/gdb/irix5-nat.c b/gdb/irix5-nat.c
index 26027f466b7ad23f26064dfd554f85887d770d48..72ce3051429355e7274e14a17d3e10745be79ed2 100644 (file)
--- a/gdb/irix5-nat.c
+++ b/gdb/irix5-nat.c
@@ -761,7 +761,7 @@ GLOBAL FUNCTION
 
 SYNOPSIS
 
-       int solib_address (CORE_ADDR address)
+       char *solib_address (CORE_ADDR address)
 
 DESCRIPTION
 
@@ -777,7 +777,7 @@ DESCRIPTION
        mapped in.
  */
 
-int
+char *
 solib_address (address)
      CORE_ADDR address;
 {
@@ -789,9 +789,7 @@ solib_address (address)
        {
          if ((address >= (CORE_ADDR) LM_ADDR (so)) &&
              (address < (CORE_ADDR) so -> lmend))
-           {
-             return (1);
-           }
+           return (so->lm.o_path);
        }
     }
   return (0);

diff --git a/gdb/osfsolib.c b/gdb/osfsolib.c
index cdc2de9efc1397bcffdab17a035a5d440290e5fd..b97e683968d30904bb68ba9c73c1d607cce334f4 100644 (file)
--- a/gdb/osfsolib.c
+++ b/gdb/osfsolib.c
@@ -770,7 +770,7 @@ GLOBAL FUNCTION
 
 SYNOPSIS
 
-       int solib_address (CORE_ADDR address)
+       char *solib_address (CORE_ADDR address)
 
 DESCRIPTION
 
@@ -786,7 +786,7 @@ DESCRIPTION
        mapped in.
  */
 
-int
+char *
 solib_address (address)
      CORE_ADDR address;
 {
@@ -798,9 +798,7 @@ solib_address (address)
        {
          if ((address >= (CORE_ADDR) so -> textsection -> addr) &&
              (address < (CORE_ADDR) so -> textsection -> endaddr))
-           {
-             return (1);
-           }
+           return (so->so_name);
        }
     }
   return (0);