summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2011-11-18 16:10:02 +0000
committerjoerg <joerg@NetBSD.org>2011-11-18 16:10:02 +0000
commit2dfde4916ac6a9721261c50df48ce525de1bb108 (patch)
tree792c04a26cb7317eabd802fc97ec0f12b87969e5 /libexec
parent1826f35ef510329ea12e9f79f039bc9c0791036b (diff)
Hook up TLS support on ARM. Tested by martin@, kernel support from matt@
Diffstat (limited to 'libexec')
-rw-r--r--libexec/ld.elf_so/arch/arm/mdreloc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libexec/ld.elf_so/arch/arm/mdreloc.c b/libexec/ld.elf_so/arch/arm/mdreloc.c
index ad00873dee8..533826d4266 100644
--- a/libexec/ld.elf_so/arch/arm/mdreloc.c
+++ b/libexec/ld.elf_so/arch/arm/mdreloc.c
@@ -1,8 +1,8 @@
-/* $NetBSD: mdreloc.c,v 1.36 2011/04/12 16:40:04 matt Exp $ */
+/* $NetBSD: mdreloc.c,v 1.37 2011/11/18 16:10:03 joerg Exp $ */
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.36 2011/04/12 16:40:04 matt Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.37 2011/11/18 16:10:03 joerg Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -179,7 +179,6 @@ _rtld_relocate_nonplt_objects(Obj_Entry *obj)
rdbg(("COPY (avoid in main)"));
break;
-#ifdef __HAVE_TLS_VARIANT_I
case R_TYPE(TLS_DTPOFF32):
def = _rtld_find_symdef(symnum, obj, &defobj, false);
if (def == NULL)
@@ -232,7 +231,6 @@ _rtld_relocate_nonplt_objects(Obj_Entry *obj)
obj->strtab + obj->symtab[symnum].st_name,
obj->path, (void *)tmp));
break;
-#endif /* __HAVE_TLS_VARIANT_I */
default:
rdbg(("sym = %lu, type = %lu, offset = %p, "