summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2022-07-06 17:35:20 +0000
committermartin <martin@NetBSD.org>2022-07-06 17:35:20 +0000
commit528e84f42eb81b1f3262a70ef6feb7584308adaf (patch)
tree1873994b94d5f6bd1a80de356ca16c28cc3111e8 /libexec
parent403c7a2933480cc12630312795dfd61ce2138438 (diff)
Fix copy & pasto: DTPREL relocations do not need to allocate a static
TLS index. Patch from joerg@
Diffstat (limited to 'libexec')
-rw-r--r--libexec/ld.elf_so/arch/powerpc/ppc_reloc.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c b/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c
index 133b12f6c06..37ca160e619 100644
--- a/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c
+++ b/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ppc_reloc.c,v 1.61 2020/05/24 02:33:11 macallan Exp $ */
+/* $NetBSD: ppc_reloc.c,v 1.62 2022/07/06 17:35:20 martin Exp $ */
/*-
* Copyright (C) 1998 Tsubai Masanari
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ppc_reloc.c,v 1.61 2020/05/24 02:33:11 macallan Exp $");
+__RCSID("$NetBSD: ppc_reloc.c,v 1.62 2022/07/06 17:35:20 martin Exp $");
#endif /* not lint */
#include <stdarg.h>
@@ -313,9 +313,6 @@ _rtld_relocate_nonplt_objects(Obj_Entry *obj)
break;
case R_TYPE(DTPREL):
- if (!defobj->tls_done && _rtld_tls_offset_allocate(obj))
- return -1;
-
*where = (Elf_Addr)(def->st_value + rela->r_addend
- TLS_DTV_OFFSET);
rdbg(("DTPREL32 %s in %s --> %p in %s",