Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix c++ exceptions on arm; jemalloc calls _rtld_tls_get_addr from inside 

dl_iterate_phdr, so we need to unlock and relock.
This commit is contained in:
christos 2019-04-13 03:15:25 +00:00
parent e66054b66e
commit 15018ca013
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libexec/ld.elf_so/rtld.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rtld.c,v 1.195 2018/12/30 01:48:37 christos Exp $ */
/* $NetBSD: rtld.c,v 1.196 2019/04/13 03:15:25 christos Exp $ */
/*
* Copyright 1996 John D. Polstra.
@ -40,7 +40,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: rtld.c,v 1.195 2018/12/30 01:48:37 christos Exp $");
__RCSID("$NetBSD: rtld.c,v 1.196 2019/04/13 03:15:25 christos Exp $");
#endif /* not lint */
#include <sys/param.h>
@ -1462,7 +1462,9 @@ dl_iterate_phdr(int (*callback)(struct dl_phdr_info *, size_t, void *), void *pa
phdr_info.dlpi_subs = _rtld_objloads - _rtld_objcount;
/* XXXlocking: exit point */
_rtld_shared_exit();
error = callback(&phdr_info, sizeof(phdr_info), param);
_rtld_shared_enter();
if (error)
break;
}