ARM: Pass dl_hwcap to IFUNC resolver.

For REL relocs pass dl_hwcap to the IFUNC resolver
as is required by the IFUNC API (bug 15905).

diff --git a/NEWS b/NEWS
index 84e066872413169ef0c6b8d0277b8b468ca8a6aa..cb55e7f4b0dfaf4d5b702d37ed47de4dc3c9b6d8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Version 2.19
 
 * The following bugs are resolved with this release:
 
-  14699, 15531, 15532, 15736, 15749, 15797, 15867, 15890, 15897.
+  14699, 15531, 15532, 15736, 15749, 15797, 15867, 15890, 15897, 15905.
 
 * CVE-2013-4237 The readdir_r function could write more than NAME_MAX bytes
   to the d_name member of struct dirent, or omit the terminating NUL

diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index 1e7a35c6a91c9c3ea7d4664f59d7429a6f0cfbfd..52f7c0f726ffef7d55ba960b47dd88ed15a252bd 100644 (file)
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,3 +1,10 @@
+2013-08-28  Kyle McMartin  <kyle@redhat.com>
+           Carlos O'Donell  <carlos@redhat.com>
+
+       [BZ #15905]
+       * sysdeps/arm/dl-machine [!RTLD_BOOTSTRAP] (elf_machine_rel):
+       Pass GLRO(dl_hwcap) to the IFUNC resolver.
+
 2013-07-03  Joseph Myers  <joseph@codesourcery.com>
 
        * sysdeps/arm/include/bits/setjmp.h [_ISOMAC] (JMP_BUF_REGLIST):

diff --git a/ports/sysdeps/arm/dl-machine.h b/ports/sysdeps/arm/dl-machine.h
index d25152733870b1214ace05048e97c0cf2c70740d..85dba67fb3a44a0b70fd474657775c9dec345306 100644 (file)
--- a/ports/sysdeps/arm/dl-machine.h
+++ b/ports/sysdeps/arm/dl-machine.h
@@ -503,7 +503,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *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