diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2015-07-27 16:04:40 +0200 |
|---|---|---|
| committer | Nikola Veljkovic <Nikola.Veljkovic@imgtec.com> | 2016-04-06 19:50:55 +0200 |
| commit | d929cfd50d770364fd652d252abc19598b0cc84c (patch) | |
| tree | 26620c4c560b26a6f22ba23c7da78b5ad4a34e87 | |
| parent | a696d1d39e22f355b9f7762a0beeed014df761da (diff) | |
| download | toolchain_binutils-d929cfd50d770364fd652d252abc19598b0cc84c.zip toolchain_binutils-d929cfd50d770364fd652d252abc19598b0cc84c.tar.gz toolchain_binutils-d929cfd50d770364fd652d252abc19598b0cc84c.tar.bz2 | |
Fix DT_MIPS_RLD_MAP_REL tag for n64 target and 32-bit host.
Cherry-picked from upstream: d5cff5df74b18e1e5ed94de8f4c9adee3ffd95c6
For the case of MIPS n64 target and 32-bit host, the computation of
the DT_MIPS_RLD_MAP_REL tag involves sdyn->output_section->vma +
sdyn->output_offset (64-bit) being added to b (32-bit host pointer),
so losing the high part and resulting in an incorrect
DT_MIPS_RLD_MAP_REL tag, and all dynamically linked glibc tests
failing for n64. This patch fixes this (spot-tested with glibc tests;
however, I don't have a self-contained testcase for this bug).
* 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.
Change-Id: If4984d632723a36a3d6c739a96706b5636f975bc
Conflicts:
binutils-2.25/bfd/ChangeLog
| -rw-r--r-- | binutils-2.25/bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | binutils-2.25/bfd/elfxx-mips.c | 2 |
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; |