This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Commit: Revert patch to strip-10.d. Fix targets that triggered the failure
- From: Nick Clifton <nickc at redhat dot com>
- To: binutils at sourceware dot org
- Date: Wed, 29 Jan 2014 14:06:07 +0000
- Subject: Commit: Revert patch to strip-10.d. Fix targets that triggered the failure
- Authentication-results: sourceware.org; auth=none
Hi Guys,
As H.J. pointed out 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.
Cheers
Nick
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.
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);
}
diff --git a/binutils/testsuite/binutils-all/strip-10.d b/binutils/testsuite/binutils-all/strip-10.d
index 949bc67..f4cf76d 100644
--- a/binutils/testsuite/binutils-all/strip-10.d
+++ b/binutils/testsuite/binutils-all/strip-10.d
@@ -5,6 +5,6 @@
#name: strip on STB_GNU_UNIQUE
#...
- OS/ABI:[ \t]+UNIX - (GNU|System V)
+ OS/ABI:[ \t]+UNIX - GNU
#...
+[0-9]+: +[0-9a-f]+ +[0-9]+ +OBJECT +(UNIQUE|<OS specific>: 10) +DEFAULT +[1-9] foo