From fedba1d81362cf9d0c714564b7079f64ed57ed4a Mon Sep 17 00:00:00 2001
From: mycroft <mycroft@NetBSD.org>
Date: Mon, 3 Apr 2000 04:20:44 +0000
Subject: [PATCH] Clean up.

---
 lib/libc/arch/i386/sys/cerror.S | 34 ++++++++-------------------------
 1 file changed, 8 insertions(+), 26 deletions(-)

diff --git a/lib/libc/arch/i386/sys/cerror.S b/lib/libc/arch/i386/sys/cerror.S
index 31cb41bf5244..ad8cec7922a1 100644
--- a/lib/libc/arch/i386/sys/cerror.S
+++ b/lib/libc/arch/i386/sys/cerror.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: cerror.S,v 1.12 2000/02/19 21:04:58 mycroft Exp $	*/
+/*	$NetBSD: cerror.S,v 1.13 2000/04/03 04:20:44 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -40,41 +40,23 @@
 
 #include <machine/asm.h>
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: cerror.S,v 1.12 2000/02/19 21:04:58 mycroft Exp $")
+	RCSID("$NetBSD: cerror.S,v 1.13 2000/04/03 04:20:44 mycroft Exp $")
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include "SYS.h"
 
-#ifdef _REENTRANT
 	.globl	_C_LABEL(__errno)
-#else
-	.globl	_C_LABEL(errno)
-#endif
+
 _ENTRY(CERROR)
+	pushl	%eax
 #ifdef PIC
 	PIC_PROLOGUE
-#endif
-
-#ifdef _REENTRANT
-	pushl	%eax
-# ifdef PIC
 	call	PIC_PLT(_C_LABEL(__errno))
-# else
-	call	_C_LABEL(__errno)
-# endif /* PIC */
-	popl	(%eax)
-#else
-# ifdef PIC
-	movl	PIC_GOT(_C_LABEL(errno)),%ecx
-	movl	%eax,(%ecx)
-# else
-	movl	%eax,_C_LABEL(errno)
-# endif /* PIC */
-#endif /* _REENTRANT */
-
-#ifdef PIC
 	PIC_EPILOGUE
-#endif
+#else
+	call	_C_LABEL(__errno)
+#endif /* PIC */
+	popl	(%eax)
 	movl	$-1,%eax
 	movl	$-1,%edx
 	ret