summaryrefslogtreecommitdiff
path: root/ldso
diff options
context:
space:
mode:
authorYann Sionneau <yann@sionneau.net>2020-03-31 08:51:31 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2020-04-01 21:43:45 +0200
commitdb4b12ae6213a28136d7622b74405c6c71c055b0 (patch)
tree8abd01ec4ca6a45be982bb327d46eea1016c4751 /ldso
parentcb6a910ab89befef46ebb6251a9800110bbd5c08 (diff)
or1k: fix some TLS issues
Before this commit tst-tls-at-ctor test would segfault. After it passes. testsuite run before: https://pastebin.com/504JgQXa testsuite run after: https://pastebin.com/d2aNciVt Stafford Horne already fixed it in glibc: * https://github.com/openrisc/or1k-glibc/blob/bcd87396ebe78228645c0731b06c934dfd88855a/sysdeps/or1k/dl-machine.h#L298 * https://github.com/openrisc/or1k-glibc/blob/bcd87396ebe78228645c0731b06c934dfd88855a/sysdeps/or1k/dl-machine.h#L99
Diffstat (limited to 'ldso')
-rw-r--r--ldso/ldso/or1k/dl-sysdep.h6
-rw-r--r--ldso/ldso/or1k/elfinterp.c4
2 files changed, 6 insertions, 4 deletions
diff --git a/ldso/ldso/or1k/dl-sysdep.h b/ldso/ldso/or1k/dl-sysdep.h
index d79249449..d838a50eb 100644
--- a/ldso/ldso/or1k/dl-sysdep.h
+++ b/ldso/ldso/or1k/dl-sysdep.h
@@ -36,8 +36,10 @@ do { \
#define ELF_TARGET "or1k"
#define elf_machine_type_class(type) \
- (((type) == R_OR1K_JMP_SLOT) * ELF_RTYPE_CLASS_PLT \
- | ((type) == R_OR1K_COPY) * ELF_RTYPE_CLASS_COPY)
+ (((type) == R_OR1K_JMP_SLOT || (type) == R_OR1K_TLS_DTPMOD || \
+ (type) == R_OR1K_TLS_DTPOFF || \
+ (type) == R_OR1K_TLS_TPOFF) * ELF_RTYPE_CLASS_PLT \
+ | ((type) == R_OR1K_COPY) * ELF_RTYPE_CLASS_COPY)
static inline Elf32_Addr *
or1k_get_got (void)
diff --git a/ldso/ldso/or1k/elfinterp.c b/ldso/ldso/or1k/elfinterp.c
index 7fd0825ae..6b6589af5 100644
--- a/ldso/ldso/or1k/elfinterp.c
+++ b/ldso/ldso/or1k/elfinterp.c
@@ -249,11 +249,11 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct r_scope_elem *scope,
*reloc_addr = tls_tpnt->l_tls_modid;
break;
case R_OR1K_TLS_DTPOFF:
- *reloc_addr = symbol_addr;
+ *reloc_addr = symbol_addr + rpnt->r_addend;
break;
case R_OR1K_TLS_TPOFF:
CHECK_STATIC_TLS ((struct link_map *) tls_tpnt);
- *reloc_addr = tls_tpnt->l_tls_offset + symbol_addr + rpnt->r_addend;
+ *reloc_addr = tls_tpnt->l_tls_offset + symbol_addr + rpnt->r_addend - TLS_TCB_SIZE;
break;
#endif