aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2016-11-28 16:14:56 +1030
committerAlan Modra <amodra@gmail.com>2016-11-30 22:12:00 +1030
commite9a38e0f5287ce7b4629f5f923191e38dd7355c0 (patch)
treee733f64910000d33cb10287d2ff4fd804006d57a
parent502d895cd1ca5d4abf4ef55984cbf5239aeaef0c (diff)
downloadgdb-e9a38e0f5287ce7b4629f5f923191e38dd7355c0.zip
gdb-e9a38e0f5287ce7b4629f5f923191e38dd7355c0.tar.gz
gdb-e9a38e0f5287ce7b4629f5f923191e38dd7355c0.tar.bz2
Revert accidental elf.c change
* elf.c (get_program_header_size): Revert accidental change.
-rw-r--r--bfd/ChangeLog4
-rw-r--r--bfd/elf.c2
2 files changed, 5 insertions, 1 deletions
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)