sparc64: Fix handling of R_SPARC_TLS_LE_* relocations.

diff --git a/ChangeLog b/ChangeLog
index b46b4417af48b9b19c13f780f12c18a05c4936ee..b8e28237d7962d39896ef06c510f55c04a19e1b9 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.
+
 2009-10-27  Aurelien Jarno  <aurelien@aurel32.net>
 
        [BZ #10855]

diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h
index 3eee6729124bdbafb5f95100139617a1d2dd8f7b..bc76c67817a5ac5005975dcd66cfc111def0d6fe 100644 (file)
--- a/sysdeps/sparc/sparc64/dl-machine.h
+++ b/sysdeps/sparc/sparc64/dl-machine.h
@@ -623,11 +623,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