summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2011-04-02 12:30:41 +0000
committerjoerg <joerg@NetBSD.org>2011-04-02 12:30:41 +0000
commit98cf8fb2a1136f1e6104a1bca93d2efa5dbf84cb (patch)
tree7e6b78c838e88e130139e0577939be124f0d8307 /libexec
parent3232af5cc409fe6472ad3b9fdc244aad7f5fc68c (diff)
Unbreak HPPA
Diffstat (limited to 'libexec')
-rw-r--r--libexec/ld.elf_so/rtld.c25
1 files changed, 23 insertions, 2 deletions
diff --git a/libexec/ld.elf_so/rtld.c b/libexec/ld.elf_so/rtld.c
index e6838a9e2de..320416b34cd 100644
--- a/libexec/ld.elf_so/rtld.c
+++ b/libexec/ld.elf_so/rtld.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.c,v 1.148 2011/03/29 20:56:35 joerg Exp $ */
+/* $NetBSD: rtld.c,v 1.149 2011/04/02 12:30:41 joerg Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: rtld.c,v 1.148 2011/03/29 20:56:35 joerg Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.149 2011/04/02 12:30:41 joerg Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -1147,6 +1147,9 @@ dladdr(const void *addr, Dl_info *info)
const Elf_Sym *def, *best_def;
void *symbol_addr;
unsigned long symoffset;
+#ifdef __HAVE_FUNCTION_DESCRIPTORS
+ sigset_t mask;
+#endif
dbg(("dladdr of %p", addr));
@@ -1405,6 +1408,24 @@ _rtld_objlist_remove(Objlist *list, Obj_Entry *obj)
}
}
+void
+_rtld_lock(int arg, sigset_t *mask)
+{
+ switch (arg) {
+ default:
+ dbg(("%s: invalid argument: %d", __func__, arg));
+ break;
+ case RTLD_LOCK_PRE_FORK:
+ _rtld_exclusive_enter(mask);
+ _rtld_mutex_may_recurse = true;
+ break;
+ case RTLD_LOCK_POST_FORK:
+ _rtld_mutex_may_recurse = false;
+ _rtld_exclusive_exit(mask);
+ break;
+ }
+}
+
#define RTLD_EXCLUSIVE_MASK 0x80000000U
static volatile unsigned int _rtld_mutex;
static volatile unsigned int _rtld_waiter_exclusive;