From 695c31738b1a1f052f777630bd914b7f3f783b9b Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 23 Jul 2012 15:25:12 +0000 Subject: [PATCH] * solib-svr4.c (enable_break): Update. * bfd-target.h (target_bfd_reopen): Update documentation. --- gdb/ChangeLog | 5 +++++ gdb/bfd-target.h | 6 +++--- gdb/solib-svr4.c | 12 ++++++++---- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c07c9db8256..c4712518a1a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2012-07-23 Tom Tromey + + * solib-svr4.c (enable_break): Update. + * bfd-target.h (target_bfd_reopen): Update documentation. + 2012-07-23 Tom Tromey * symfile.c (separate_debug_file_exists): Update. diff --git a/gdb/bfd-target.h b/gdb/bfd-target.h index 71001c5f346..7f4e628e2a7 100644 --- 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 307e48392fe..76bd87257f9 100644 --- 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) -- 2.30.2