aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2014-01-29 14:01:54 +0000
committerNick Clifton <nickc@redhat.com>2014-01-29 14:01:54 +0000
commitdf3ce959f4f4598f73c4e02f45e65ad1fd6f4f7c (patch)
tree8c00915c1c095769eef2ab04d40c65c619cc03ce /bfd
parent27b829ee701e29804216b3803fbaeb629be27491 (diff)
downloadgdb-df3ce959f4f4598f73c4e02f45e65ad1fd6f4f7c.zip
gdb-df3ce959f4f4598f73c4e02f45e65ad1fd6f4f7c.tar.gz
gdb-df3ce959f4f4598f73c4e02f45e65ad1fd6f4f7c.tar.bz2
My patch to the binutils strip-10.d test was wrong. The osabi field should always be set to
ELFOSABI_GNU for binaries containing unique symbols. So I am reverting that patch and instead applying the patch below to fix up the targets that were triggering the test failure. bfd/ChangeLog 2014-01-29 Nick Clifton <nickc@redhat.com> * elf32-metag.c (elf_metag_post_process_headers): Call _bfd_elf_post_process_headers. * elf32-sh64.c (sh64_elf_copy_private_data): Call _bfd_elf_copy_private_data. * elf64-sh64.c (sh_elf64_copy_private_data_internal): Likewise. binutils/testsuite/ChangeLog 2014-01-29 Nick Clifton <nickc@redhat.com> * binutils-all/strip-10.d: Revert previous delta.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog9
-rw-r--r--bfd/elf32-metag.c3
-rw-r--r--bfd/elf32-sh64.c3
-rw-r--r--bfd/elf64-sh64.c4
4 files changed, 15 insertions, 4 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index bf05401..ec39127 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,14 @@
2014-01-29 Nick Clifton <nickc@redhat.com>
+ PR binutils/16318
+ * elf32-metag.c (elf_metag_post_process_headers): Call
+ _bfd_elf_post_process_headers.
+ * elf32-sh64.c (sh64_elf_copy_private_data): Call
+ _bfd_elf_copy_private_data.
+ * elf64-sh64.c (sh_elf64_copy_private_data_internal): Likewise.
+
+2014-01-29 Nick Clifton <nickc@redhat.com>
+
* bfd-in.h (bfd_set_section_vma): Delete.
(bfd_set_section_alignment): Delete.
(bfd_set_section_userdata): Delete.
diff --git a/bfd/elf32-metag.c b/bfd/elf32-metag.c
index 9c11dd3..4b85f22 100644
--- a/bfd/elf32-metag.c
+++ b/bfd/elf32-metag.c
@@ -3249,10 +3249,11 @@ elf_metag_finish_dynamic_symbol (bfd *output_bfd,
/* Set the Meta ELF ABI version. */
static void
-elf_metag_post_process_headers (bfd * abfd, struct bfd_link_info * link_info ATTRIBUTE_UNUSED)
+elf_metag_post_process_headers (bfd * abfd, struct bfd_link_info * link_info)
{
Elf_Internal_Ehdr * i_ehdrp; /* ELF file header, internal form. */
+ _bfd_elf_post_process_headers (abfd, link_info);
i_ehdrp = elf_elfheader (abfd);
i_ehdrp->e_ident[EI_ABIVERSION] = METAG_ELF_ABI_VERSION;
}
diff --git a/bfd/elf32-sh64.c b/bfd/elf32-sh64.c
index 2848f19..d1daa0d 100644
--- a/bfd/elf32-sh64.c
+++ b/bfd/elf32-sh64.c
@@ -199,7 +199,8 @@ sh64_elf_copy_private_data (bfd * ibfd, bfd * obfd)
== elf_elfheader (ibfd)->e_flags));
elf_elfheader (obfd)->e_flags = elf_elfheader (ibfd)->e_flags;
- return TRUE;
+
+ return _bfd_elf_copy_private_bfd_data (ibfd, obfd);
}
static bfd_boolean
diff --git a/bfd/elf64-sh64.c b/bfd/elf64-sh64.c
index e70887b..10a9396 100644
--- a/bfd/elf64-sh64.c
+++ b/bfd/elf64-sh64.c
@@ -2286,8 +2286,8 @@ sh_elf64_copy_private_data_internal (bfd *ibfd, bfd *obfd)
}
/* Copy object attributes. */
- _bfd_elf_copy_obj_attributes (ibfd, obfd);
-
+ _bfd_elf_copy_private_bfd_data (ibfd, obfd);
+
return sh_elf64_set_private_flags (obfd, elf_elfheader (ibfd)->e_flags);
}