summaryrefslogtreecommitdiff
path: root/lib/libthr/thread/thr_exit.c
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2017-05-26 19:11:24 +0000
committerDimitry Andric <dim@FreeBSD.org>2017-05-26 19:11:24 +0000
commitd02c951f8ec631d059ec7a8addb8a104cd160280 (patch)
tree95a3b1baea805cde74e09666d77a5b9f11d95aff /lib/libthr/thread/thr_exit.c
parentd8866befb86698415f5ef82446c22f6da5fb2bd9 (diff)
parentb5617df55b52e1be5b9f07bf00ac345f304c2497 (diff)
Notes
Diffstat (limited to 'lib/libthr/thread/thr_exit.c')
-rw-r--r--lib/libthr/thread/thr_exit.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/libthr/thread/thr_exit.c b/lib/libthr/thread/thr_exit.c
index decc2f2983b7..0df0b8c2c8d0 100644
--- a/lib/libthr/thread/thr_exit.c
+++ b/lib/libthr/thread/thr_exit.c
@@ -46,8 +46,6 @@ __FBSDID("$FreeBSD$");
#include "libc_private.h"
#include "thr_private.h"
-void _pthread_exit(void *status);
-
static void exit_thread(void) __dead2;
__weak_reference(_pthread_exit, pthread_exit);
@@ -72,7 +70,7 @@ static void
thread_uw_init(void)
{
static int inited = 0;
- Dl_info dlinfo;
+ Dl_info dli;
void *handle;
void *forcedunwind, *getcfa;
@@ -80,12 +78,12 @@ thread_uw_init(void)
return;
handle = RTLD_DEFAULT;
if ((forcedunwind = dlsym(handle, "_Unwind_ForcedUnwind")) != NULL) {
- if (dladdr(forcedunwind, &dlinfo)) {
+ if (dladdr(forcedunwind, &dli)) {
/*
* Make sure the address is always valid by holding the library,
* also assume functions are in same library.
*/
- if ((handle = dlopen(dlinfo.dli_fname, RTLD_LAZY)) != NULL) {
+ if ((handle = dlopen(dli.dli_fname, RTLD_LAZY)) != NULL) {
forcedunwind = dlsym(handle, "_Unwind_ForcedUnwind");
getcfa = dlsym(handle, "_Unwind_GetCFA");
if (forcedunwind != NULL && getcfa != NULL) {