summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2016-04-20 14:32:48 (GMT)
committerandroid-build-merger <android-build-merger@google.com>2016-04-20 14:32:48 (GMT)
commit2b51ecbab101466172f47f38953929b1653210c1 (patch)
tree26620c4c560b26a6f22ba23c7da78b5ad4a34e87
parent52d9ff81dbe9a79e6c0bace624091067b046948b (diff)
parent1966aefbbe2e442cf8589e1b64e889fbc6e60272 (diff)
downloadtoolchain_binutils-2b51ecbab101466172f47f38953929b1653210c1.zip
toolchain_binutils-2b51ecbab101466172f47f38953929b1653210c1.tar.gz
toolchain_binutils-2b51ecbab101466172f47f38953929b1653210c1.tar.bz2
Fix DT_MIPS_RLD_MAP_REL tag for n64 target and 32-bit host. am: d929cfd
am: 1966aef * commit '1966aefbbe2e442cf8589e1b64e889fbc6e60272': Fix DT_MIPS_RLD_MAP_REL tag for n64 target and 32-bit host. Change-Id: I4f6b65c3c7dd8f2ceac76fb2e7642420549bd8fa
-rw-r--r--binutils-2.25/bfd/ChangeLog6
-rw-r--r--binutils-2.25/bfd/elfxx-mips.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/binutils-2.25/bfd/ChangeLog b/binutils-2.25/bfd/ChangeLog
index f3c81a8..f229d66 100644
--- a/binutils-2.25/bfd/ChangeLog
+++ b/binutils-2.25/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-23 Joseph Myers <joseph@codesourcery.com>
+
+ * elfxx-mips.c (_bfd_mips_elf_finish_dynamic_sections)
+ <DT_MIPS_RLD_MAP_REL>: Add target address to host address
+ difference, not to host pointer.
+
2015-06-26 Matthew Fortune <matthew.fortune@imgtec.com>
* elfxx-mips.c (_bfd_mips_elf_create_dynamic_sections): Use executable
diff --git a/binutils-2.25/bfd/elfxx-mips.c b/binutils-2.25/bfd/elfxx-mips.c
index 3b77759..02440cd 100644
--- a/binutils-2.25/bfd/elfxx-mips.c
+++ b/binutils-2.25/bfd/elfxx-mips.c
@@ -11520,7 +11520,7 @@ _bfd_mips_elf_finish_dynamic_sections (bfd *output_bfd,
/* The MIPS_RLD_MAP_REL tag stores the offset to the debug
pointer, relative to the address of the tag. */
dt_addr = (sdyn->output_section->vma + sdyn->output_offset
- + b - sdyn->contents);
+ + (b - sdyn->contents));
rld_addr = (s->output_section->vma + s->output_offset
+ h->root.u.def.value);
dyn.d_un.d_ptr = rld_addr - dt_addr;