From: Alan Modra <amodra@gmail.com>
Date: Sat, 30 Aug 2014 00:14:47 +0000 (+0930)
Subject: ppc476 patch area size miscalculation
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6128f9cf2b2c4188145faba45596ce49dd0f08be;p=binutils-gdb.git

ppc476 patch area size miscalculation

ppc476 sections that end exactly on a page boundary need the
workaround applied when a function ends in "bctr", or when pasting
together code from multiple sections.  The space allocated for the
patch area didn't allow for this case, while the code in
relocate_section performing the patches did, leading to an assertion
failure.

	* elf32-ppc.c (ppc_elf_relax_section): Fix off by one error.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index fae94fd00a5..8cbab99e3c1 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-30  Alan Modra  <amodra@gmail.com>
+
+	* elf32-ppc.c (ppc_elf_relax_section): Fix off by one error.
+
 2014-08-29  Alan Modra  <amodra@gmail.com>
 
 	* elf64-ppc.c (ppc64_elf_relocate_section): Report a different
diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c
index 97f47243302..6fb603d3aea 100644
--- a/bfd/elf32-ppc.c
+++ b/bfd/elf32-ppc.c
@@ -7165,7 +7165,7 @@ ppc_elf_relax_section (bfd *abfd,
       bfd_vma pagesize = (bfd_vma) 1 << htab->params->pagesize_p2;
 
       addr = isec->output_section->vma + isec->output_offset;
-      end_addr = addr + trampoff - 1;
+      end_addr = addr + trampoff;
       addr &= -pagesize;
       crossings = ((end_addr & -pagesize) - addr) >> htab->params->pagesize_p2;
       if (crossings != 0)