summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2010-05-02 12:03:25 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2010-05-02 12:03:25 +0000
commit73182a166651b5a93c049694d1cb9aa5378164e1 (patch)
treee9ed96a97a9c358052ecbfb61ddbfbf9bf8b807b
parent4b106b8af0d7d4217dd1937dd7396d46b5d73a08 (diff)
Fix breakage from last commit. Bad guenther@, no cookie!
-rw-r--r--libexec/ld.so/hppa/rtld_machine.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libexec/ld.so/hppa/rtld_machine.c b/libexec/ld.so/hppa/rtld_machine.c
index e7e2b21ba4b..c54b0d28d61 100644
--- a/libexec/ld.so/hppa/rtld_machine.c
+++ b/libexec/ld.so/hppa/rtld_machine.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtld_machine.c,v 1.18 2010/05/02 04:57:01 guenther Exp $ */
+/* $OpenBSD: rtld_machine.c,v 1.19 2010/05/02 12:03:24 kettenis Exp $ */
/*
* Copyright (c) 2004 Michael Shalayeff
@@ -454,8 +454,7 @@ _dl_bind(elf_object_t *object, int reloff)
/* mprotect the actual modified region, not the whole plt */
_dl_mprotect((void*)addr, sizeof (Elf_Addr) * 3,
PROT_READ|PROT_EXEC);
- _dl_thread_bind_lock(1);
- _dl_sigprocmask(SIG_SETMASK, &omask, NULL);
+ _dl_thread_bind_lock(1, &savedmask);
}
return ((Elf_Addr)addr);