* solib-svr4.c (enable_break): Update.

	* bfd-target.h (target_bfd_reopen): Update documentation.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c07c9db825608ea5a3717977059cbf85633c8081..c4712518a1abee785c66d92c28632fc9ff4c47a8 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-23  Tom Tromey  <tromey@redhat.com>
+
+       * solib-svr4.c (enable_break): Update.
+       * bfd-target.h (target_bfd_reopen): Update documentation.
+
 2012-07-23  Tom Tromey  <tromey@redhat.com>
 
        * symfile.c (separate_debug_file_exists): Update.

diff --git a/gdb/bfd-target.h b/gdb/bfd-target.h
index 71001c5f346179236cfea8f2cdf892e94774d4e0..7f4e628e2a7be0ec32a8da827c14363bf6124a5b 100644 (file)
--- a/gdb/bfd-target.h
+++ b/gdb/bfd-target.h
@@ -23,9 +23,9 @@
 struct bfd;
 struct target_ops;
 
-/* Given an existing BFD, re-open it as a "struct target_ops".  On
-   close, it will also close the corresponding BFD (which is like
-   freopen and fdopen).  */
+/* Given an existing BFD, re-open it as a "struct target_ops".  This
+   acquires a new reference to the BFD.  This reference will be
+   released when the target is closed.  */
 struct target_ops *target_bfd_reopen (struct bfd *bfd);
 
 #endif

diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
index 307e48392fe17ef3ca0d6dcf45df1b500ed99dbf..76bd87257f987fbb9698e84970c9139be87d2faa 100644 (file)
--- a/gdb/solib-svr4.c
+++ b/gdb/solib-svr4.c
@@ -46,6 +46,7 @@
 #include "exec.h"
 #include "auxv.h"
 #include "exceptions.h"
+#include "gdb_bfd.h"
 
 static struct link_map_offsets *svr4_fetch_link_map_offsets (void);
 static int svr4_have_link_map_offsets (void);
@@ -1558,9 +1559,11 @@ enable_break (struct svr4_info *info, int from_tty)
        goto bkpt_at_symbol;
 
       /* Now convert the TMP_BFD into a target.  That way target, as
-         well as BFD operations can be used.  Note that closing the
-         target will also close the underlying bfd.  */
+         well as BFD operations can be used.  */
       tmp_bfd_target = target_bfd_reopen (tmp_bfd);
+      /* target_bfd_reopen acquired its own reference, so we can
+         release ours now.  */
+      gdb_bfd_unref (tmp_bfd);
 
       /* On a running target, we can get the dynamic linker's base
          address from the shared library table.  */
@@ -1670,8 +1673,9 @@ enable_break (struct svr4_info *info, int from_tty)
                                                       sym_addr,
                                                       tmp_bfd_target);
 
-      /* We're done with both the temporary bfd and target.  Remember,
-         closing the target closes the underlying bfd.  */
+      /* We're done with both the temporary bfd and target.  Closing
+         the target closes the underlying bfd, because it holds the
+         only remaining reference.  */
       target_close (tmp_bfd_target, 0);
 
       if (sym_addr != 0)