Module Name: src
Committed By: msaitoh
Date: Sun Sep 18 00:09:52 UTC 2022
Modified Files:
src/libexec/ld.elf_so/arch/powerpc [netbsd-9]: ppc_reloc.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #1531):
libexec/ld.elf_so/arch/powerpc/ppc_reloc.c: revision 1.62
Fix copy & pasto: DTPREL relocations do not need to allocate a static
TLS index. Patch from joerg@
To generate a diff of this commit:
cvs rdiff -u -r1.58.2.1 -r1.58.2.2 \
src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c
diff -u src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c:1.58.2.1 src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c:1.58.2.2
--- src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c:1.58.2.1 Mon Dec 9 16:14:10 2019
+++ src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c Sun Sep 18 00:09:52 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ppc_reloc.c,v 1.58.2.1 2019/12/09 16:14:10 martin Exp $ */
+/* $NetBSD: ppc_reloc.c,v 1.58.2.2 2022/09/18 00:09:52 msaitoh Exp $ */
/*-
* Copyright (C) 1998 Tsubai Masanari
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ppc_reloc.c,v 1.58.2.1 2019/12/09 16:14:10 martin Exp $");
+__RCSID("$NetBSD: ppc_reloc.c,v 1.58.2.2 2022/09/18 00:09:52 msaitoh Exp $");
#endif /* not lint */
#include <stdarg.h>
@@ -311,9 +311,6 @@ _rtld_relocate_nonplt_objects(Obj_Entry
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",
