summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorapb <apb@NetBSD.org>2012-11-07 07:24:46 +0000
committerapb <apb@NetBSD.org>2012-11-07 07:24:46 +0000
commitea80f016b54fcf38706a38062b4e8a5c0eeb4e76 (patch)
treeed77c49f898a26e162511fa1a265ff1bc79943b3 /libexec
parent13bedf32dfffa4f6fd56cee40c646e84bf4b8abf (diff)
Add support for R_386_TLS_TPOFF32. This patch was created by
Nick Hudson for PR 47061.
Diffstat (limited to 'libexec')
-rw-r--r--libexec/ld.elf_so/arch/i386/mdreloc.c21
1 files changed, 18 insertions, 3 deletions
diff --git a/libexec/ld.elf_so/arch/i386/mdreloc.c b/libexec/ld.elf_so/arch/i386/mdreloc.c
index a6f6e7721c0..88964bdda3a 100644
--- a/libexec/ld.elf_so/arch/i386/mdreloc.c
+++ b/libexec/ld.elf_so/arch/i386/mdreloc.c
@@ -1,8 +1,8 @@
-/* $NetBSD: mdreloc.c,v 1.34 2011/03/25 18:07:05 joerg Exp $ */
+/* $NetBSD: mdreloc.c,v 1.35 2012/11/07 07:24:46 apb Exp $ */
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.34 2011/03/25 18:07:05 joerg Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.35 2012/11/07 07:24:46 apb Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -129,13 +129,28 @@ _rtld_relocate_nonplt_objects(Obj_Entry *obj)
_rtld_tls_offset_allocate(obj))
return -1;
- *where = (Elf_Addr)(def->st_value - defobj->tlsoffset);
+ *where += (Elf_Addr)(def->st_value - defobj->tlsoffset);
rdbg(("TLS_TPOFF %s in %s --> %p",
obj->strtab + obj->symtab[symnum].st_name,
obj->path, (void *)*where));
break;
+ case R_TYPE(TLS_TPOFF32):
+ def = _rtld_find_symdef(symnum, obj, &defobj, false);
+ if (def == NULL)
+ return -1;
+
+ if (!defobj->tls_done &&
+ _rtld_tls_offset_allocate(obj))
+ return -1;
+
+ *where += (Elf_Addr)(defobj->tlsoffset - def->st_value);
+ rdbg(("TLS_TPOFF32 %s in %s --> %p",
+ obj->strtab + obj->symtab[symnum].st_name,
+ obj->path, (void *)*where));
+ break;
+
case R_TYPE(TLS_DTPMOD32):
def = _rtld_find_symdef(symnum, obj, &defobj, false);
if (def == NULL)