sparc64: Fix handling of R_SPARC_TLS_LE_* relocations.

diff --git a/ChangeLog b/ChangeLog
index 87c7717..2963971 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 fcfbb06..82ab5a4 100644 (file)
--- 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