summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2002-08-05 15:29:29 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2002-08-05 15:29:29 +0000
commit89567f8194b74814f141aeede93171f1d5bf4049 (patch)
tree69e5a23c59137c2ecd133818de5c29a45acd5ee6
parentefafad0d1c9c19f988dea32d53f9d2ff25245c4c (diff)
_C_LABEL where needed.
-rw-r--r--lib/libc/arch/sparc/gen/_setjmp.S4
-rw-r--r--lib/libc/arch/sparc/gen/setjmp.S4
-rw-r--r--lib/libc/arch/sparc/gen/sigsetjmp.S18
3 files changed, 13 insertions, 13 deletions
diff --git a/lib/libc/arch/sparc/gen/_setjmp.S b/lib/libc/arch/sparc/gen/_setjmp.S
index 9893575a377..6b69e3baafc 100644
--- a/lib/libc/arch/sparc/gen/_setjmp.S
+++ b/lib/libc/arch/sparc/gen/_setjmp.S
@@ -38,7 +38,7 @@
#if defined(LIBC_SCCS)
.text
- .asciz "$OpenBSD: _setjmp.S,v 1.3 1996/08/19 08:17:25 tholo Exp $"
+ .asciz "$OpenBSD: _setjmp.S,v 1.4 2002/08/05 15:29:28 art Exp $"
#endif /* LIBC_SCCS */
/*
@@ -76,7 +76,7 @@ ENTRY(_longjmp)
ld [%g1+0], %o2 ! fetch return %sp
Lbotch:
- call _longjmperror ! otherwise, went too far; bomb out
+ call _C_LABEL(longjmperror) ! otherwise, went too far; bomb out
nop
unimp 0
diff --git a/lib/libc/arch/sparc/gen/setjmp.S b/lib/libc/arch/sparc/gen/setjmp.S
index 8ca86b314c3..39fb1919b6a 100644
--- a/lib/libc/arch/sparc/gen/setjmp.S
+++ b/lib/libc/arch/sparc/gen/setjmp.S
@@ -37,7 +37,7 @@
#if defined(LIBC_SCCS)
.text
- .asciz "$OpenBSD: setjmp.S,v 1.2 1996/08/19 08:17:44 tholo Exp $"
+ .asciz "$OpenBSD: setjmp.S,v 1.3 2002/08/05 15:29:28 art Exp $"
#endif /* LIBC_SCCS */
/*
@@ -107,6 +107,6 @@ ENTRY(longjmp)
Lbotch:
/* oops, caller botched it */
- call _longjmperror
+ call _C_LABEL(longjmperror)
nop
unimp 0
diff --git a/lib/libc/arch/sparc/gen/sigsetjmp.S b/lib/libc/arch/sparc/gen/sigsetjmp.S
index 08012942c12..42f896c7ec2 100644
--- a/lib/libc/arch/sparc/gen/sigsetjmp.S
+++ b/lib/libc/arch/sparc/gen/sigsetjmp.S
@@ -31,7 +31,7 @@
#if defined(LIBC_SCCS)
.text
- .asciz "$OpenBSD: sigsetjmp.S,v 1.2 1996/08/19 08:17:45 tholo Exp $"
+ .asciz "$OpenBSD: sigsetjmp.S,v 1.3 2002/08/05 15:29:28 art Exp $"
#endif /* LIBC_SCCS */
#include "SYS.h"
@@ -43,8 +43,8 @@ ENTRY(sigsetjmp)
cmp %o1,0
st %o1,[%o0+40] ! jmpbuf[JBLEN]
bne,a 1f
- ld [%g1+_setjmp], %g1 ! if (%o1 != 0) goto _setjmp;
- ld [%g1+__setjmp], %g1 ! else goto __setjmp;
+ ld [%g1+_C_LABEL(setjmp)], %g1 ! if (%o1 != 0) goto setjmp;
+ ld [%g1+_C_LABEL(_setjmp)], %g1 ! else goto _setjmp;
1:
jmp %g1
nop
@@ -54,8 +54,8 @@ ENTRY(siglongjmp)
ld [%o0+40],%g2 ! jmpbuf[JBLEN]
cmp %g2,0
bne,a 1f
- ld [%g1+_longjmp], %g1 ! if (%g2 != 0) goto _longjmp;
- ld [%g1+__longjmp], %g1 ! else goto __longjmp;
+ ld [%g1+_C_LABEL(longjmp)], %g1 ! if (%g2 != 0) goto longjmp;
+ ld [%g1+_C_LABEL(_longjmp)], %g1 ! else goto _longjmp;
1:
jmp %g1
nop
@@ -65,18 +65,18 @@ ENTRY(siglongjmp)
ENTRY(sigsetjmp)
cmp %o1,0
- be __setjmp
+ be _C_LABEL(_setjmp)
st %o1,[%o0+40] ! jmpbuf[JBLEN]
nop
- ba,a _setjmp
+ ba,a _C_LABEL(setjmp)
unimp 0
ENTRY(siglongjmp)
ld [%o0+40],%g1
cmp %g1,0
- be __longjmp
+ be _C_LABEL(_longjmp)
nop
- ba,a _longjmp
+ ba,a _C_LABEL(_longjmp)
unimp 0
#endif /* PIC */