This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] Revert accidental elf.c change
- From: Alan Modra <amodra at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 30 Nov 2016 11:43:11 -0000
- Subject: [binutils-gdb] Revert accidental elf.c change
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=e9a38e0f5287ce7b4629f5f923191e38dd7355c0
commit e9a38e0f5287ce7b4629f5f923191e38dd7355c0
Author: Alan Modra <amodra@gmail.com>
Date: Mon Nov 28 16:14:56 2016 +1030
Revert accidental elf.c change
* elf.c (get_program_header_size): Revert accidental change.
Diff:
---
bfd/ChangeLog | 4 ++++
bfd/elf.c | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e804d6e..fc32759 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,9 @@
2016-11-30 Alan Modra <amodra@gmail.com>
+ * elf.c (get_program_header_size): Revert accidental change.
+
+2016-11-30 Alan Modra <amodra@gmail.com>
+
PR ld/20886
* elf64-ppc.c (ppc64_elf_size_stubs): Make rawsize max size seen
on any pass past STUB_SHRINK_ITER.
diff --git a/bfd/elf.c b/bfd/elf.c
index 5cc938d..3d1a28a 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -4254,7 +4254,7 @@ get_program_header_size (bfd *abfd, struct bfd_link_info *info)
PT_INTERP segment. In this case, assume we also need a
PT_PHDR segment, although that may not be true for all
targets. */
- segs += 3;
+ segs += 2;
}
if (bfd_get_section_by_name (abfd, ".dynamic") != NULL)