Module Name: src
Committed By: jakllsch
Date: Thu Sep 20 19:02:22 UTC 2018
Modified Files:
src/libexec/ld.elf_so/arch/aarch64: mdreloc.c
Log Message:
Revise previous to not deadlock.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/libexec/ld.elf_so/arch/aarch64/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/aarch64/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/aarch64/mdreloc.c:1.9 src/libexec/ld.elf_so/arch/aarch64/mdreloc.c:1.10
--- src/libexec/ld.elf_so/arch/aarch64/mdreloc.c:1.9 Thu Sep 20 18:41:05 2018
+++ src/libexec/ld.elf_so/arch/aarch64/mdreloc.c Thu Sep 20 19:02:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mdreloc.c,v 1.9 2018/09/20 18:41:05 jakllsch Exp $ */
+/* $NetBSD: mdreloc.c,v 1.10 2018/09/20 19:02:22 jakllsch Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.9 2018/09/20 18:41:05 jakllsch Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.10 2018/09/20 19:02:22 jakllsch Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -412,7 +412,7 @@ _rtld_relocate_plt_object(const Obj_Entr
if (ELF_R_SYM(rela->r_info) != 0) {
struct tls_data *tlsdesc = (struct tls_data *)where[1];
if (tlsdesc->index == -1)
- _rtld_tlsdesc_handle(tlsdesc, SYMLOOK_IN_PLT);
+ _rtld_tlsdesc_handle_locked(tlsdesc, SYMLOOK_IN_PLT);
}
break;
}
