summaryrefslogtreecommitdiff
path: root/lib/libc/arch/powerpc
diff options
context:
space:
mode:
authorPhilip Guenther <guenther@cvs.openbsd.org>2015-09-13 07:36:59 +0000
committerPhilip Guenther <guenther@cvs.openbsd.org>2015-09-13 07:36:59 +0000
commitacd27e3126009714e62b716d2352d7c439d37219 (patch)
treecdf95a2d876a298bfde0fbab66c532b1fd99d945 /lib/libc/arch/powerpc
parent935fadcb6d65619c7e89e38170798865f6d7f187 (diff)
Do provide hidden _libc_* aliases for sig{block,setmask} and use them in
the ASM *setjmp implementations. Skip the PLT when calling them on amd64 (other archs to do this after testing) ok miod@
Diffstat (limited to 'lib/libc/arch/powerpc')
-rw-r--r--lib/libc/arch/powerpc/gen/setjmp.S10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libc/arch/powerpc/gen/setjmp.S b/lib/libc/arch/powerpc/gen/setjmp.S
index 3a4e532623c..bbbe854e23d 100644
--- a/lib/libc/arch/powerpc/gen/setjmp.S
+++ b/lib/libc/arch/powerpc/gen/setjmp.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: setjmp.S,v 1.7 2015/08/23 15:42:01 kettenis Exp $ */
+/* $OpenBSD: setjmp.S,v 1.8 2015/09/13 07:36:58 guenther Exp $ */
/*
* Copyright (c) 1996 Dale Rahn. All rights reserved.
*
@@ -55,7 +55,7 @@
#define JMP_sig 0x60
-.extern sigblock
+.extern _libc_sigblock
ENTRY(setjmp)
/* r31, mask */
@@ -71,7 +71,7 @@ ENTRY(setjmp)
#endif
mr 31, 3
li 3, 0
- bl PIC_PLT(sigblock)
+ bl PIC_PLT(_libc_sigblock)
stw 3, JMP_sig(31)
/* should sigaltstack be checked and saved */
mr 3, 31
@@ -116,7 +116,7 @@ ENTRY(_setjmp)
blr
-.extern sigsetmask
+.extern _libc_sigsetmask
ENTRY(longjmp)
/* r31, mask */
mr 29, 3
@@ -130,7 +130,7 @@ ENTRY(longjmp)
mtlr 0
#endif
lwz 3, JMP_sig(3)
- bl PIC_PLT(sigsetmask)
+ bl PIC_PLT(_libc_sigsetmask)
/* should we deal with sigonstack here ?? */
mr 4, 31
mr 3, 29