diff options
| author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2009-08-10 22:09:22 +0000 |
|---|---|---|
| committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2009-08-10 22:09:22 +0000 |
| commit | 4f6f9936b60049a0f3d8725b279b3a61082660f2 (patch) | |
| tree | 5a683d632568461f451063a0f6f0852623ae6e65 | |
| parent | 62cc2e1fa2d79bc4a8cf92d9e9b6216f97d0a9ee (diff) | |
| download | gdb-4f6f9936b60049a0f3d8725b279b3a61082660f2.zip gdb-4f6f9936b60049a0f3d8725b279b3a61082660f2.tar.gz gdb-4f6f9936b60049a0f3d8725b279b3a61082660f2.tar.bz2 | |
gdb/
* objfiles.c (gdb_bfd_unref): Use the bfd_usrdata accessor.
* solib.c (symbol_add_stub): Likewise.
* symfile.c (symfile_bfd_open): Assert BFD_USRDATA is NULL.
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/objfiles.c | 4 | ||||
| -rw-r--r-- | gdb/solib.c | 2 | ||||
| -rw-r--r-- | gdb/symfile.c | 3 |
4 files changed, 12 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0d41791..6355f7b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2009-08-10 Jan Kratochvil <jan.kratochvil@redhat.com> + + * objfiles.c (gdb_bfd_unref): Use the bfd_usrdata accessor. + * solib.c (symbol_add_stub): Likewise. + * symfile.c (symfile_bfd_open): Assert BFD_USRDATA is NULL. + 2009-08-10 Paul Pluzhnikov <ppluzhnikov@google.com> * objfiles.c (qsort_cmp): Remove assert. diff --git a/gdb/objfiles.c b/gdb/objfiles.c index 6663c33..586f5d0 100644 --- a/gdb/objfiles.c +++ b/gdb/objfiles.c @@ -1070,7 +1070,7 @@ gdb_bfd_unref (struct bfd *abfd) if (abfd == NULL) return; - p_refcount = abfd->usrdata; + p_refcount = bfd_usrdata (abfd); /* Valid range for p_refcount: NULL (single owner), or a pointer to int counter, which has a value of 1 (single owner) or 2 (shared). */ @@ -1083,7 +1083,7 @@ gdb_bfd_unref (struct bfd *abfd) return; } xfree (p_refcount); - abfd->usrdata = NULL; /* Paranoia. */ + bfd_usrdata (abfd) = NULL; /* Paranoia. */ name = bfd_get_filename (abfd); if (!bfd_close (abfd)) diff --git a/gdb/solib.c b/gdb/solib.c index 564a55c..aad2d59 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -459,7 +459,7 @@ symbol_add_stub (struct so_list *so, int flags) so->objfile = symbol_file_add_from_bfd (so->abfd, flags, sap, OBJF_SHARED); p_refcount = xmalloc (sizeof (*p_refcount)); *p_refcount = 2; /* Both solib and objfile refer to this abfd. */ - so->abfd->usrdata = p_refcount; + bfd_usrdata (so->abfd) = p_refcount; free_section_addr_info (sap); diff --git a/gdb/symfile.c b/gdb/symfile.c index 4bdab91..c182faa 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -1638,6 +1638,9 @@ symfile_bfd_open (char *name) bfd_errmsg (bfd_get_error ())); } + /* bfd_usrdata exists for applications and libbfd must not touch it. */ + gdb_assert (bfd_usrdata (sym_bfd) == NULL); + return sym_bfd; } |