diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | sysdeps/arm/dl-machine.h | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2014-04-30 Julian Brown <julian@codesourcery.com> + + [BZ #16888] + * sysdeps/arm/dl-machine.h (elf_machine_rela): Fix R_ARM_IRELATIVE + handling. + 2014-04-30 Joseph Myers <joseph@codesourcery.com> [BZ #9894] @@ -15,7 +15,7 @@ Version 2.20 16632, 16634, 16639, 16642, 16648, 16649, 16670, 16674, 16677, 16680, 16683, 16689, 16695, 16701, 16706, 16707, 16712, 16713, 16714, 16731, 16739, 16740, 16743, 16754, 16758, 16759, 16760, 16770, 16786, 16789, - 16791, 16799, 16800, 16815, 16823, 16824, 16831, 16838, 16854. + 16791, 16799, 16800, 16815, 16823, 16824, 16831, 16838, 16854, 16888. * The minimum Linux kernel version that this version of the GNU C Library can be used with is 2.6.32. diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h index 02d1a5ebdf..899b2568f3 100644 --- a/sysdeps/arm/dl-machine.h +++ b/sysdeps/arm/dl-machine.h @@ -594,7 +594,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, } break; case R_ARM_IRELATIVE: - value = map->l_addr + *reloc_addr; + value = map->l_addr + reloc->r_addend; value = ((Elf32_Addr (*) (int)) value) (GLRO(dl_hwcap)); *reloc_addr = value; break; |