Rename cerror to __cerror on i386 to avoid namespace pollution.

8 files changed, 23 insertions, 23 deletions

diff --git a/lib/libc/arch/i386/SYS.h b/lib/libc/arch/i386/SYS.h
index 5e7d396973f..db822ba7963 100644
--- a/lib/libc/arch/i386/SYS.h
+++ b/lib/libc/arch/i386/SYS.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$OpenBSD: SYS.h,v 1.12 2002/06/10 17:44:38 fgsch Exp $
+ *	$OpenBSD: SYS.h,v 1.13 2002/10/06 23:24:13 art Exp $
  */
 
 #include <machine/asm.h>
@@ -84,7 +84,7 @@
 			.text;				\
 			.align 2;			\
 		2:					\
-			jmp PIC_PLT(cerror);		\
+			jmp PIC_PLT(__cerror);		\
 		_SYSCALL_NOERROR(x,y)			\
 			jc 2b
 
@@ -105,4 +105,4 @@
 #define	RSYSCALL(x)					\
 			PSEUDO(x,x);
 
-	.globl	cerror
+	.globl	__cerror
diff --git a/lib/libc/arch/i386/sys/brk.S b/lib/libc/arch/i386/sys/brk.S
index 3f316823f07..58e78c33570 100644
--- a/lib/libc/arch/i386/sys/brk.S
+++ b/lib/libc/arch/i386/sys/brk.S
@@ -38,7 +38,7 @@
 
 #if defined(SYSLIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: brk.S,v 1.3 1997/09/17 17:23:38 weingart Exp $"
+	.asciz "$OpenBSD: brk.S,v 1.4 2002/10/06 23:24:13 art Exp $"
 #endif /* SYSLIB_SCCS */
 
 	.globl	_end
@@ -70,7 +70,7 @@ ENTRY(brk)
 	movl	%ecx,(%edx)
 	ret
 err:
-	jmp	PIC_PLT(cerror)
+	jmp	PIC_PLT(__cerror)
 
 #else
 
@@ -87,5 +87,5 @@ err:
 	movl	%ecx,curbrk
 	ret
 err:
-	jmp	cerror
+	jmp	__cerror
 #endif
diff --git a/lib/libc/arch/i386/sys/cerror.S b/lib/libc/arch/i386/sys/cerror.S
index 2ea1c353590..11512c86b50 100644
--- a/lib/libc/arch/i386/sys/cerror.S
+++ b/lib/libc/arch/i386/sys/cerror.S
@@ -38,11 +38,11 @@
 
 #if defined(SYSLIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: cerror.S,v 1.2 1996/08/19 08:13:29 tholo Exp $"
+	.asciz "$OpenBSD: cerror.S,v 1.3 2002/10/06 23:24:13 art Exp $"
 #endif /* SYSLIB_SCCS */
 
 	.globl	_errno
-cerror:
+__cerror:
 #ifdef PIC
 	PIC_PROLOGUE
 	movl	PIC_GOT(_errno),%ecx
diff --git a/lib/libc/arch/i386/sys/exect.S b/lib/libc/arch/i386/sys/exect.S
index 965f8d498bc..99ed7bfe48c 100644
--- a/lib/libc/arch/i386/sys/exect.S
+++ b/lib/libc/arch/i386/sys/exect.S
@@ -39,7 +39,7 @@
 
 #if defined(SYSLIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: exect.S,v 1.2 1996/08/19 08:13:31 tholo Exp $"
+	.asciz "$OpenBSD: exect.S,v 1.3 2002/10/06 23:24:13 art Exp $"
 #endif /* SYSLIB_SCCS */
 
 ENTRY(exect)
@@ -51,7 +51,7 @@ ENTRY(exect)
 	popf
 	int	$0x80
 #ifdef PIC
-	jmp	PIC_PLT(cerror)		/* exect(file, argv, env); */
+	jmp	PIC_PLT(__cerror)		/* exect(file, argv, env); */
 #else
-	jmp	cerror
+	jmp	__cerror
 #endif
diff --git a/lib/libc/arch/i386/sys/sbrk.S b/lib/libc/arch/i386/sys/sbrk.S
index 1cbafaae322..45dbe92fa8b 100644
--- a/lib/libc/arch/i386/sys/sbrk.S
+++ b/lib/libc/arch/i386/sys/sbrk.S
@@ -38,7 +38,7 @@
 
 #if defined(SYSLIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: sbrk.S,v 1.3 1997/07/23 20:55:22 kstailey Exp $"
+	.asciz "$OpenBSD: sbrk.S,v 1.4 2002/10/06 23:24:13 art Exp $"
 #endif /* SYSLIBC_SCCS */
 
 	.globl	_end
@@ -66,7 +66,7 @@ ENTRY(sbrk)
 	addl	%ecx,(%edx)
 	ret
 err:
-	jmp	PIC_PLT(cerror)
+	jmp	PIC_PLT(__cerror)
 
 #else
 
@@ -80,5 +80,5 @@ err:
 	addl	%ecx,curbrk
 	ret
 err:
-	jmp	cerror
+	jmp	__cerror
 #endif
diff --git a/lib/libc/arch/i386/sys/sigprocmask.S b/lib/libc/arch/i386/sys/sigprocmask.S
index ee3d19b7d87..1a473e252eb 100644
--- a/lib/libc/arch/i386/sys/sigprocmask.S
+++ b/lib/libc/arch/i386/sys/sigprocmask.S
@@ -38,7 +38,7 @@
 
 #if defined(SYSLIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: sigprocmask.S,v 1.4 1998/11/20 11:18:30 d Exp $"
+	.asciz "$OpenBSD: sigprocmask.S,v 1.5 2002/10/06 23:24:13 art Exp $"
 #endif /* SYSLIBC_SCCS */
 
 SYSENTRY(sigprocmask)
@@ -62,7 +62,7 @@ out:
 	ret
 err:
 #ifdef PIC
-	jmp	PIC_PLT(cerror)
+	jmp	PIC_PLT(__cerror)
 #else
-	jmp	cerror
+	jmp	__cerror
 #endif
diff --git a/lib/libc/arch/i386/sys/sigsuspend.S b/lib/libc/arch/i386/sys/sigsuspend.S
index f0c84ce734c..d31b954cf0f 100644
--- a/lib/libc/arch/i386/sys/sigsuspend.S
+++ b/lib/libc/arch/i386/sys/sigsuspend.S
@@ -38,7 +38,7 @@
 
 #if defined(SYSLIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: sigsuspend.S,v 1.3 1998/11/20 11:18:30 d Exp $"
+	.asciz "$OpenBSD: sigsuspend.S,v 1.4 2002/10/06 23:24:13 art Exp $"
 #endif /* SYSLIBC_SCCS */
 
 SYSENTRY(sigsuspend)
@@ -52,7 +52,7 @@ SYSENTRY(sigsuspend)
 	ret
 err:
 #ifdef PIC
-	jmp	PIC_PLT(cerror)
+	jmp	PIC_PLT(__cerror)
 #else
-	jmp	cerror
+	jmp	__cerror
 #endif
diff --git a/lib/libc/arch/i386/sys/syscall.S b/lib/libc/arch/i386/sys/syscall.S
index 6ecd61cd4ed..cd2e5e09b12 100644
--- a/lib/libc/arch/i386/sys/syscall.S
+++ b/lib/libc/arch/i386/sys/syscall.S
@@ -38,7 +38,7 @@
 
 #if defined(SYSLIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: syscall.S,v 1.3 1998/11/20 11:18:30 d Exp $"
+	.asciz "$OpenBSD: syscall.S,v 1.4 2002/10/06 23:24:13 art Exp $"
 #endif /* SYSLIBC_SCCS */
 
 SYSENTRY(syscall)
@@ -51,7 +51,7 @@ SYSENTRY(syscall)
 	ret
 err:
 #ifdef PIC
-	jmp	PIC_PLT(cerror)
+	jmp	PIC_PLT(__cerror)
 #else
-	jmp	cerror
+	jmp	__cerror
 #endif