diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-09 03:48:24 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-09 03:48:24 -0800 |
| commit | d6d1c4c87c3f2e60d9aab570aefc3e63d0467f33 (patch) | |
| tree | 3586e3e115b8199e7d60ebd442b6a2e2e53c77a2 | |
| parent | 058e9ba9fd03b86246b8ed3c49392fa783a5c337 (diff) | |
| download | glibc-d6d1c4c87c3f2e60d9aab570aefc3e63d0467f33.tar glibc-d6d1c4c87c3f2e60d9aab570aefc3e63d0467f33.tar.gz glibc-d6d1c4c87c3f2e60d9aab570aefc3e63d0467f33.tar.bz2 glibc-d6d1c4c87c3f2e60d9aab570aefc3e63d0467f33.zip | |
sparc64: Fix handling of R_SPARC_TLS_LE_* relocations.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc64/dl-machine.h | 10 |
2 files changed, 12 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2010-03-09 David S. Miller <davem@davemloft.net> + + * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Handling + of R_SPARC_TLS_LE_* needs to use 32-bit loads and stores, not + 64-bit ones. + 2010-03-07 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/internal_statvfs.c (__statvfs_getflags): diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h index fcfbb06ac2..82ab5a4547 100644 --- a/sysdeps/sparc/sparc64/dl-machine.h +++ b/sysdeps/sparc/sparc64/dl-machine.h @@ -513,11 +513,13 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc, value = sym->st_value - sym_map->l_tls_offset + reloc->r_addend; if (r_type == R_SPARC_TLS_LE_HIX22) - *reloc_addr = (*reloc_addr & 0xffc00000) - | (((~value) >> 10) & 0x3fffff); + *(unsigned int *)reloc_addr = + ((*(unsigned int *)reloc_addr & 0xffc00000) + | (((~value) >> 10) & 0x3fffff)); else - *reloc_addr = (*reloc_addr & 0xffffe000) | (value & 0x3ff) - | 0x1c00; + *(unsigned int *)reloc_addr = + ((*(unsigned int *)reloc_addr & 0xffffe000) | (value & 0x3ff) + | 0x1c00); } break; # endif |