diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 45d5a788b9..d750ccd7bd 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2000-04-27  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
+
+	* cxux-nat.c (add_shared_symbol_files): Don't treat .text section
+ 	as special in the section_addr_info structure.
+	* pa64solib.c (pa64_solib_add_solib_objfile): Ditto.
+	* osfsolib.c (symbol_add_stub): Ditto.
+	* irix5-nat.c (symbol_add_stub): Ditto.
+
 Thu Apr 27 14:07:16 2000  Andrew Cagney  <cagney@b1.cygnus.com>
 
 	* mips-tdep.c, d10v-tdep.c: Include "arch-utils.h".
diff --git a/gdb/cxux-nat.c b/gdb/cxux-nat.c
index 9db528a06b..8c16bceb98 100644
--- a/gdb/cxux-nat.c
+++ b/gdb/cxux-nat.c
@@ -386,7 +386,8 @@ add_shared_symbol_files ()
 	    {
 	      struct section_addr_info section_addrs;
 	      memset (&section_addrs, 0, sizeof (section_addrs));
-	      section_addrs.text_addr = lms.l_addr;
+	      section_addrs.other[0].addr = lms.l_addr;
+              section_addrs.other[0].name = ".text";
 	      symbol_file_add (path_name, 1, &section_addrs, 0, 0);
 	      free (path_name);
 	    }
diff --git a/gdb/irix5-nat.c b/gdb/irix5-nat.c
index 0c090de647..2a16dc07eb 100644
--- a/gdb/irix5-nat.c
+++ b/gdb/irix5-nat.c
@@ -852,7 +852,9 @@ symbol_add_stub (arg)
 	text_addr = bfd_section_vma (so->abfd, lowest_sect) + LM_OFFSET (so);
     }
 
-  section_addrs.text_addr = text_addr;
+
+  section_addrs.other[0].name = ".text";
+  section_addrs.other[0].addr = text_addr;
   so->objfile = symbol_file_add (so->so_name, so->from_tty,
 				 &section_addrs, 0, 0);
   return (1);
diff --git a/gdb/osfsolib.c b/gdb/osfsolib.c
index 3ea550ace3..8638629139 100644
--- a/gdb/osfsolib.c
+++ b/gdb/osfsolib.c
@@ -598,7 +598,8 @@ symbol_add_stub (arg)
 	text_addr = bfd_section_vma (so->abfd, lowest_sect) + LM_OFFSET (so);
     }
 
-  section_addrs.text_addr = text_addr;
+  section_addrs.other[0].addr = text_addr;
+  section_addrs.other[0].name = ".text";
   so->objfile = symbol_file_add (so->so_name, so->from_tty,
 				 &section_addrs, 0, OBJF_SHARED);
   return (1);
diff --git a/gdb/pa64solib.c b/gdb/pa64solib.c
index 271efc2367..cb991b2c09 100644
--- a/gdb/pa64solib.c
+++ b/gdb/pa64solib.c
@@ -272,7 +272,8 @@ pa64_solib_add_solib_objfile (so, name, from_tty, text_addr)
   tmp_bfd = NULL;
 
   /* Now let the generic code load up symbols for this library.  */
-  section_addrs.text_addr = text_addr;
+  section_addrs.other[0].addr = text_addr;
+  section_addrs.other[0].name = ".text";
   so->objfile = symbol_file_add (name, from_tty, &section_addrs, 0, OBJF_SHARED);
   so->abfd = so->objfile->obfd;