Module Name: src
Committed By: martin
Date: Wed Aug 2 07:12:04 UTC 2023
Modified Files:
src/libexec/ld.elf_so/arch/riscv [netbsd-10]: mdreloc.c
Log Message:
Fix member name in patch for ticket #297 (fix dlopen with static thread-local
storage)
To generate a diff of this commit:
cvs rdiff -u -r1.7.2.1 -r1.7.2.2 src/libexec/ld.elf_so/arch/riscv/mdreloc.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/riscv/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/riscv/mdreloc.c:1.7.2.1 src/libexec/ld.elf_so/arch/riscv/mdreloc.c:1.7.2.2
--- src/libexec/ld.elf_so/arch/riscv/mdreloc.c:1.7.2.1 Tue Aug 1 16:34:59 2023
+++ src/libexec/ld.elf_so/arch/riscv/mdreloc.c Wed Aug 2 07:12:04 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mdreloc.c,v 1.7.2.1 2023/08/01 16:34:59 martin Exp $ */
+/* $NetBSD: mdreloc.c,v 1.7.2.2 2023/08/02 07:12:04 martin Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.7.2.1 2023/08/01 16:34:59 martin Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.7.2.2 2023/08/02 07:12:04 martin Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -168,7 +168,7 @@ _rtld_relocate_nonplt_objects(Obj_Entry
Elf_Addr old = *where;
Elf_Addr val = old;
- if (!defobj->tls_done &&
+ if (!defobj->tls_static &&
_rtld_tls_offset_allocate(__UNCONST(defobj)))
return -1;
