36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
ChangeLog | 6 ++++++
|
|
sysdeps/sparc/sparc64/dl-machine.h | 10 ++++++----
|
|
2 files changed, 12 insertions(+), 4 deletions(-)
|
|
--- a/ChangeLog
|
|
+++ a/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]
|
|
--- a/sysdeps/sparc/sparc64/dl-machine.h
|
|
+++ a/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
|