aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@imgtec.com>2016-12-23 20:03:36 +0000
committerMaciej W. Rozycki <macro@imgtec.com>2016-12-23 20:03:36 +0000
commit4d4f40e041ce7c8c7c8e50f957e0440b64ab7e95 (patch)
tree76d5696f0af19a0126d935c3d85ab3efe6607773
parent5284e471d53ccb7c7a1d140bd83098607ccf4b8a (diff)
downloadgdb-4d4f40e041ce7c8c7c8e50f957e0440b64ab7e95.zip
gdb-4d4f40e041ce7c8c7c8e50f957e0440b64ab7e95.tar.gz
gdb-4d4f40e041ce7c8c7c8e50f957e0440b64ab7e95.tar.bz2
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.
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elfxx-mips.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 99c7062..38f7d39 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-12-23 Alan Modra <amodra@gmail.com>
* linker.c (generic_link_check_archive_element): Call target
diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index d649676..486607c 100644
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -16358,9 +16358,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