diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 50b3b9e7d0..6a994a3f4d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2005-06-13  Mark Mitchell  <mark@codesourcery.com>
+
+	* corelow.c (core_open): Use bfd_fopen, not bfd_fdopenr.
+	* exec.c (exec_file_attach): Likewise.
+	* solib-frv.c (enable_break2): Likewise.
+	* solib-svr4.c (enable_break): Likewise.
+	* solib.c (solib_map_sections): Likewise.
+	* symfile.c (symfile_bfd_open): Likewise.
+
 2005-06-13  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* Makefile.in (symfile.o): Add $(exec_h).
diff --git a/gdb/corelow.c b/gdb/corelow.c
index 3e70ed4bfa..c07b574971 100644
--- a/gdb/corelow.c
+++ b/gdb/corelow.c
@@ -316,7 +316,9 @@ core_open (char *filename, int from_tty)
   if (scratch_chan < 0)
     perror_with_name (filename);
 
-  temp_bfd = bfd_fdopenr (filename, gnutarget, scratch_chan);
+  temp_bfd = bfd_fopen (filename, gnutarget, 
+			write_files ? FOPEN_RUB : FOPEN_RB,
+			scratch_chan);
   if (temp_bfd == NULL)
     perror_with_name (filename);
 
diff --git a/gdb/exec.c b/gdb/exec.c
index 60e3b36ae3..69d10bf98e 100644
--- a/gdb/exec.c
+++ b/gdb/exec.c
@@ -214,7 +214,9 @@ exec_file_attach (char *filename, int from_tty)
 #endif
       if (scratch_chan < 0)
 	perror_with_name (filename);
-      exec_bfd = bfd_fdopenr (scratch_pathname, gnutarget, scratch_chan);
+      exec_bfd = bfd_fopen (scratch_pathname, gnutarget,
+			    write_files ? FOPEN_RUB : FOPEN_RB,
+			    scratch_chan);
 
       if (!exec_bfd)
 	error (_("\"%s\": could not open as an executable file: %s"),
diff --git a/gdb/solib-frv.c b/gdb/solib-frv.c
index 4647b955c5..48be77df7e 100644
--- a/gdb/solib-frv.c
+++ b/gdb/solib-frv.c
@@ -648,7 +648,7 @@ enable_break2 (void)
 
       tmp_fd  = solib_open (buf, &tmp_pathname);
       if (tmp_fd >= 0)
-	tmp_bfd = bfd_fdopenr (tmp_pathname, gnutarget, tmp_fd);
+	tmp_bfd = bfd_fopen (tmp_pathname, gnutarget, FOPEN_RB, tmp_fd);
 
       if (tmp_bfd == NULL)
 	{
diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
index f260ba980b..828ec7c316 100644
--- a/gdb/solib-svr4.c
+++ b/gdb/solib-svr4.c
@@ -883,7 +883,7 @@ enable_break (void)
 
       tmp_fd  = solib_open (buf, &tmp_pathname);
       if (tmp_fd >= 0)
-	tmp_bfd = bfd_fdopenr (tmp_pathname, gnutarget, tmp_fd);
+	tmp_bfd = bfd_fopen (tmp_pathname, gnutarget, FOPEN_RB, tmp_fd);
 
       if (tmp_bfd == NULL)
 	goto bkpt_at_symbol;
diff --git a/gdb/solib.c b/gdb/solib.c
index dd885a92ed..19e7ff7e56 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -277,7 +277,7 @@ solib_map_sections (void *arg)
     }
 
   /* Leave scratch_pathname allocated.  abfd->name will point to it.  */
-  abfd = bfd_fdopenr (scratch_pathname, gnutarget, scratch_chan);
+  abfd = bfd_fopen (scratch_pathname, gnutarget, FOPEN_RB, scratch_chan);
   if (!abfd)
     {
       close (scratch_chan);
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 7bd3853bf7..43eb28fef3 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -1372,7 +1372,7 @@ symfile_bfd_open (char *name)
   name = absolute_name;		/* Keep 2nd malloc'd copy in bfd */
   /* It'll be freed in free_objfile(). */
 
-  sym_bfd = bfd_fdopenr (name, gnutarget, desc);
+  sym_bfd = bfd_fopen (name, gnutarget, FOPEN_RB, desc);
   if (!sym_bfd)
     {
       close (desc);