Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/libexec/ld.elf_so/arch/aarch64 Revise previous to not deadlock.



details:   https://anonhg.NetBSD.org/src/rev/89b9f771cecb
branches:  trunk
changeset: 835996:89b9f771cecb
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Thu Sep 20 19:02:22 2018 +0000

description:
Revise previous to not deadlock.

diffstat:

 libexec/ld.elf_so/arch/aarch64/mdreloc.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 537f68bba657 -r 89b9f771cecb libexec/ld.elf_so/arch/aarch64/mdreloc.c
--- a/libexec/ld.elf_so/arch/aarch64/mdreloc.c  Thu Sep 20 18:41:05 2018 +0000
+++ b/libexec/ld.elf_so/arch/aarch64/mdreloc.c  Thu Sep 20 19:02:22 2018 +0000
@@ -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 @@
                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;
        }



Home | Main Index | Thread Index | Old Index