This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb/binutils-2_27-branch] MIPS/BFD: Remove EI_ABIVERSION 5 allocation for PT_GNU_STACK support
- From: Maciej W.Rozycki <macro at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 23 Dec 2016 20:43:57 -0000
- Subject: [binutils-gdb/binutils-2_27-branch] MIPS/BFD: Remove EI_ABIVERSION 5 allocation for PT_GNU_STACK support
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=fb646a8cbcec77c2d9e603fea56dfb1dd6e7b772
commit fb646a8cbcec77c2d9e603fea56dfb1dd6e7b772
Author: Maciej W. Rozycki <macro@imgtec.com>
Date: Fri Dec 23 20:03:36 2016 +0000
MIPS/BFD: Remove EI_ABIVERSION 5 allocation for PT_GNU_STACK support
Revert commit 17733f5be961 ("Increment the ABIVERSION to 5 for MIPS
objects with non-executable stacks.") and remove EI_ABIVERSION 5
allocation for PT_GNU_STACK support, which has not made it to glibc
and will be reassigned.
bfd/
* bfd/elfxx-mips.c (_bfd_mips_post_process_headers): Revert
2016-02-23 change and remove EI_ABIVERSION 5 support.
(cherry picked from commit 4d4f40e041ce7c8c7c8e50f957e0440b64ab7e95)
Diff:
---
bfd/ChangeLog | 5 +++++
bfd/elfxx-mips.c | 3 ---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index d8b13c8..dd1ffdd 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-23 Maciej W. Rozycki <macro@imgtec.com>
+
+ * bfd/elfxx-mips.c (_bfd_mips_post_process_headers): Revert
+ 2016-02-23 change and remove EI_ABIVERSION 5 support.
+
2016-11-30 Alan Modra <amodra@gmail.com>
PR ld/20886
diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index e47276b..80e171d 100644
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -16187,9 +16187,6 @@ _bfd_mips_post_process_headers (bfd *abfd, struct bfd_link_info *link_info)
if (mips_elf_tdata (abfd)->abiflags.fp_abi == Val_GNU_MIPS_ABI_FP_64
|| mips_elf_tdata (abfd)->abiflags.fp_abi == Val_GNU_MIPS_ABI_FP_64A)
i_ehdrp->e_ident[EI_ABIVERSION] = 3;
-
- if (elf_stack_flags (abfd) && !(elf_stack_flags (abfd) & PF_X))
- i_ehdrp->e_ident[EI_ABIVERSION] = 5;
}
int