diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-07 19:51:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-07 19:51:06 -0700 |
| commit | 9b849836f534bbd250a6733ebc1edf32e5f4d5dc (patch) | |
| tree | eb61bca9d2a94781588f322f7ae37345667bc43c /sysdeps/sparc/sparc64/dl-machine.h | |
| parent | 5a31b2836d55bcc0c5b6f90f1e89245118e7f508 (diff) | |
| download | glibc-9b849836f534bbd250a6733ebc1edf32e5f4d5dc.tar.gz glibc-9b849836f534bbd250a6733ebc1edf32e5f4d5dc.tar.xz glibc-9b849836f534bbd250a6733ebc1edf32e5f4d5dc.zip | |
sparc: Fix LD_BIND_NOW with multiarch.
Diffstat (limited to 'sysdeps/sparc/sparc64/dl-machine.h')
| -rw-r--r-- | sysdeps/sparc/sparc64/dl-machine.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h index 82ab5a4547..aaa22d6540 100644 --- a/sysdeps/sparc/sparc64/dl-machine.h +++ b/sysdeps/sparc/sparc64/dl-machine.h @@ -430,7 +430,7 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc, if (sym != NULL && __builtin_expect (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC, 0) && __builtin_expect (sym->st_shndx != SHN_UNDEF, 1)) - value = ((Elf64_Addr (*) (void)) value) (); + value = ((Elf64_Addr (*) (int)) value) (GLRO(dl_hwcap)); switch (r_type) { @@ -460,11 +460,11 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc, *reloc_addr = value; break; case R_SPARC_IRELATIVE: - value = ((Elf64_Addr (*) (void)) value) (); + value = ((Elf64_Addr (*) (int)) value) (GLRO(dl_hwcap)); *reloc_addr = value; break; case R_SPARC_JMP_IREL: - value = ((Elf64_Addr (*) (void)) value) (); + value = ((Elf64_Addr (*) (int)) value) (GLRO(dl_hwcap)); /* Fall thru */ case R_SPARC_JMP_SLOT: #ifdef RESOLVE_CONFLICT_FIND_MAP @@ -658,7 +658,7 @@ elf_machine_lazy_rel (struct link_map *map, || r_type == R_SPARC_IRELATIVE) { Elf64_Addr value = map->l_addr + reloc->r_addend; - value = ((Elf64_Addr (*) (void)) value) (); + value = ((Elf64_Addr (*) (int)) value) (GLRO(dl_hwcap)); if (r_type == R_SPARC_JMP_IREL) { /* 'high' is always zero, for large PLT entries the linker |