cerror -> __cerror as suggested by art, with a couple of missing _ASM_LABEL()

added as appropriate.

6 files changed, 10 insertions, 10 deletions

diff --git a/lib/libc/arch/powerpc/SYS.h b/lib/libc/arch/powerpc/SYS.h
index 725147aa6bf..9d371f8bd36 100644
--- a/lib/libc/arch/powerpc/SYS.h
+++ b/lib/libc/arch/powerpc/SYS.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: SYS.h,v 1.12 2002/02/19 22:12:36 millert Exp $	*/
+/*	$OpenBSD: SYS.h,v 1.13 2002/10/07 04:16:33 drahn Exp $	*/
 /*-
  * Copyright (c) 1994
  *	Andrew Cagney.  All rights reserved.
@@ -46,20 +46,20 @@
 
 #ifdef __STDC__
 #define _CONCAT(x,y)	x##y
-#define PSEUDO_PREFIX(p,x,y)	.extern cerror ; \
+#define PSEUDO_PREFIX(p,x,y)	.extern _ASM_LABEL(__cerror) ; \
 			ENTRY(p##x) \
 				li 0, SYS_##y ; \
 				/* sc */
 #else /* !__STDC__ */
 #define _CONCAT(x,y)	x/**/y
-#define PSEUDO_PREFIX(p,x,y)	.extern cerror ; \
+#define PSEUDO_PREFIX(p,x,y)	.extern _ASM_LABEL(__cerror) ; \
 			ENTRY(p/**/x) \
 				li 0, SYS_/**/y ; \
 				/* sc */
 #endif /* !__STDC__ */
 #define PSEUDO_SUFFIX		cmpwi 0, 0 ; \
 				beqlr+ ; \
-				b PIC_PLT(_ASM_LABEL(cerror))
+				b PIC_PLT(_ASM_LABEL(__cerror))
 
 #define PSEUDO_NOERROR_SUFFIX	blr
 
diff --git a/lib/libc/arch/powerpc/sys/brk.S b/lib/libc/arch/powerpc/sys/brk.S
index ce1e0a8a00b..be1be589b56 100644
--- a/lib/libc/arch/powerpc/sys/brk.S
+++ b/lib/libc/arch/powerpc/sys/brk.S
@@ -35,7 +35,7 @@ PREFIX2(brk,break)
 	/* check for error */
 	cmpwi	0, 0
 	beq+	.L_brk_ok	/* OK so this is stupid but I haven't read b */
-	b	PIC_PLT(_ASM_LABEL(cerror))
+	b	PIC_PLT(_ASM_LABEL(__cerror))
 
 	/* update, curbrk and return */
 .L_brk_ok:
diff --git a/lib/libc/arch/powerpc/sys/cerror.S b/lib/libc/arch/powerpc/sys/cerror.S
index 49d44fcd4b8..a2f0870ea7e 100644
--- a/lib/libc/arch/powerpc/sys/cerror.S
+++ b/lib/libc/arch/powerpc/sys/cerror.S
@@ -2,7 +2,7 @@
 #include <machine/asm.h>
 
 	.text
-ENTRY(cerror)
+ASENTRY(__cerror)
 #if defined (PIC)
 	stwu	1, -16(1) 		/* follow the SVR4 ABI */
 	mflr	3			/* error value is in r0, use r3 */
diff --git a/lib/libc/arch/powerpc/sys/exect.S b/lib/libc/arch/powerpc/sys/exect.S
index a5676a4c2b4..741d51236fc 100644
--- a/lib/libc/arch/powerpc/sys/exect.S
+++ b/lib/libc/arch/powerpc/sys/exect.S
@@ -3,7 +3,7 @@
  */
 #if defined(SYSLIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: exect.S,v 1.3 1999/01/28 05:09:12 rahnds Exp $"
+	.asciz "$OpenBSD: exect.S,v 1.4 2002/10/07 04:16:34 drahn Exp $"
 #endif /* SYSLIBC_SCCS */
 
 #include "SYS.h"
@@ -15,7 +15,7 @@ PREFIX2(exect,execve)
 	/* check for error */
 	cmpwi	0, 0
 	beq+	_ASM_LABEL(exect_ok) 
-	b	PIC_PLT(_ASM_LABEL(cerror))
+	b	PIC_PLT(_ASM_LABEL(__cerror))
 
 	/* update, curbrk and return */
 exect_ok:
diff --git a/lib/libc/arch/powerpc/sys/sbrk.S b/lib/libc/arch/powerpc/sys/sbrk.S
index 9a990d8fc8b..1c51482fe2e 100644
--- a/lib/libc/arch/powerpc/sys/sbrk.S
+++ b/lib/libc/arch/powerpc/sys/sbrk.S
@@ -33,7 +33,7 @@ PREFIX2(sbrk,break)
 	/* check for error */
 	cmpwi	0, 0
 	beq+	.L_sbrk_ok
-	b	PIC_PLT(_ASM_LABEL(cerror))
+	b	PIC_PLT(_ASM_LABEL(__cerror))
 
 	/* update, curbrk and return */
 .L_sbrk_ok:
diff --git a/lib/libc/arch/powerpc/sys/sigprocmask.S b/lib/libc/arch/powerpc/sys/sigprocmask.S
index 0211b33c3e9..d44a916e6f9 100644
--- a/lib/libc/arch/powerpc/sys/sigprocmask.S
+++ b/lib/libc/arch/powerpc/sys/sigprocmask.S
@@ -22,7 +22,7 @@ PREFIX(sigprocmask)
 	/* didnt work? */
 	cmpwi	0, 0
 	beq+	.L_sigprocmask_ok
-	b	PIC_PLT(_ASM_LABEL(cerror))
+	b	PIC_PLT(_ASM_LABEL(__cerror))
 
 .L_sigprocmask_ok:
 	lwz	5, 12(1)