aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Newton <will.newton@linaro.org>2013-07-02 13:01:21 +0000
committerJoseph Myers <joseph@codesourcery.com>2013-07-02 13:01:21 +0000
commit1413c693d3390e02399a0042ef97b73918749977 (patch)
treeb66a8e4de2d4bd3c6f9255f5882eda791ad2a18b
parentc53e2f0a560a54fe1307233dffd002bdb6fb20d0 (diff)
downloadglibc-1413c693d3390e02399a0042ef97b73918749977.tar
glibc-1413c693d3390e02399a0042ef97b73918749977.tar.gz
glibc-1413c693d3390e02399a0042ef97b73918749977.tar.bz2
glibc-1413c693d3390e02399a0042ef97b73918749977.zip
ARM: Pass dl_hwcap to IFUNC resolver functions.
-rw-r--r--ports/ChangeLog.arm5
-rw-r--r--ports/sysdeps/arm/dl-machine.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index 6cc665c99c..2674d0ee0a 100644
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,3 +1,8 @@
+2013-07-02 Will Newton <will.newton@linaro.org>
+
+ * sysdeps/arm/dl-machine.h (elf_machine_rela): Pass dl_hwcap
+ to IFUNC resolver functions.
+
2013-06-28 Ryan S. Arnold <rsa@linux.vnet.ibm.com>
* sysdeps/unix/sysv/linux/arm/dl-procinfo.h (_dl_procinfo): Add
diff --git a/ports/sysdeps/arm/dl-machine.h b/ports/sysdeps/arm/dl-machine.h
index 4cf87a99f9..d251527338 100644
--- a/ports/sysdeps/arm/dl-machine.h
+++ b/ports/sysdeps/arm/dl-machine.h
@@ -595,7 +595,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
break;
case R_ARM_IRELATIVE:
value = map->l_addr + *reloc_addr;
- value = ((Elf32_Addr (*) (void)) value) ();
+ value = ((Elf32_Addr (*) (int)) value) (GLRO(dl_hwcap));
*reloc_addr = value;
break;
#endif