From 57e6060ea563b556bbb7d45128c508c9f2480e24 Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Wed, 17 Jul 2013 05:28:04 +0000 Subject: [PATCH] * nto-tdep.c (nto_relocate_section_addresses): Update, target_section.bfd deleted. * ppc64-tdep.c (ppc64_convert_from_func_ptr_addr): Ditto. * s390-tdep.c (s390_load): Ditto. * solib-aix.c (solib_aix_relocate_section_addresses): Ditto. --- gdb/ChangeLog | 8 ++++++++ gdb/nto-tdep.c | 2 +- gdb/ppc64-tdep.c | 3 ++- gdb/s390-tdep.c | 3 ++- gdb/solib-aix.c | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a0f22da..065484d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2013-07-16 Doug Evans + + * nto-tdep.c (nto_relocate_section_addresses): Update, + target_section.bfd deleted. + * ppc64-tdep.c (ppc64_convert_from_func_ptr_addr): Ditto. + * s390-tdep.c (s390_load): Ditto. + * solib-aix.c (solib_aix_relocate_section_addresses): Ditto. + 2013-07-16 Andrew Burgess * common/format.c (parse_format_string): Add checks for NULL diff --git a/gdb/nto-tdep.c b/gdb/nto-tdep.c index 3ed48a9..fa31f14 100644 --- a/gdb/nto-tdep.c +++ b/gdb/nto-tdep.c @@ -306,7 +306,7 @@ nto_relocate_section_addresses (struct so_list *so, struct target_section *sec) /* Neutrino treats the l_addr base address field in link.h as different than the base address in the System V ABI and so the offset needs to be calculated and applied to relocations. */ - Elf_Internal_Phdr *phdr = find_load_phdr (sec->bfd); + Elf_Internal_Phdr *phdr = find_load_phdr (sec->the_bfd_section->owner); unsigned vaddr = phdr ? phdr->p_vaddr : 0; sec->addr = nto_truncate_ptr (sec->addr + lm_addr (so) - vaddr); diff --git a/gdb/ppc64-tdep.c b/gdb/ppc64-tdep.c index 8732182..a2098fe 100644 --- a/gdb/ppc64-tdep.c +++ b/gdb/ppc64-tdep.c @@ -383,7 +383,8 @@ ppc64_convert_from_func_ptr_addr (struct gdbarch *gdbarch, gdb_byte buf[8]; int res; - res = bfd_get_section_contents (s->bfd, s->the_bfd_section, + res = bfd_get_section_contents (s->the_bfd_section->owner, + s->the_bfd_section, &buf, addr - s->addr, 8); if (res != 0) return extract_unsigned_integer (buf, 8, byte_order) diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c index 6111bbf..72d5545 100644 --- a/gdb/s390-tdep.c +++ b/gdb/s390-tdep.c @@ -1179,7 +1179,8 @@ s390_load (struct s390_prologue_data *data, struct target_section *secp; secp = target_section_by_addr (¤t_target, addr.k); if (secp != NULL - && (bfd_get_section_flags (secp->bfd, secp->the_bfd_section) + && (bfd_get_section_flags (secp->the_bfd_section->owner, + secp->the_bfd_section) & SEC_READONLY)) return pv_constant (read_memory_integer (addr.k, size, data->byte_order)); diff --git a/gdb/solib-aix.c b/gdb/solib-aix.c index efc0dc5..29574f2 100644 --- a/gdb/solib-aix.c +++ b/gdb/solib-aix.c @@ -390,8 +390,8 @@ static void solib_aix_relocate_section_addresses (struct so_list *so, struct target_section *sec) { - bfd *abfd = sec->bfd; struct bfd_section *bfd_sect = sec->the_bfd_section; + bfd *abfd = bfd_sect->owner; const char *section_name = bfd_section_name (abfd, bfd_sect); struct lm_info *info = so->lm_info; -- 2.7.4