From b2dd53724922eb7fc08e8bbb0693c8606010a3b9 Mon Sep 17 00:00:00 2001
From: John Birrell <jb@FreeBSD.org>
Date: Tue, 5 May 1998 22:07:02 +0000
Subject: [PATCH] Use the thread-aware errno definition all the time.

---
 lib/libc/amd64/sys/vfork.S | 25 +++----------------------
 lib/libc/i386/sys/Ovfork.S | 25 +++----------------------
 2 files changed, 6 insertions(+), 44 deletions(-)

diff --git a/lib/libc/amd64/sys/vfork.S b/lib/libc/amd64/sys/vfork.S
index e4ed257d3c33..1da267369c2a 100644
--- a/lib/libc/amd64/sys/vfork.S
+++ b/lib/libc/amd64/sys/vfork.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: Ovfork.S,v 1.6 1997/02/22 14:59:28 peter Exp $
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$Id: Ovfork.S,v 1.6 1997/02/22 14:59:28 peter Exp $"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "DEFS.h"
@@ -61,10 +61,7 @@ vforkok:
 	cmpl	$0,%edx		/* child process? */
 	jne	child		/* yes */
 	jmp 	parent 
-#ifdef	_THREAD_SAFE
-	/*
-	 * Threaded version using __error().
-	 */
+
 	.globl	CNAME(__error)
 	.type	CNAME(__error),@function
 verror:
@@ -78,22 +75,6 @@ verror:
 	movl	%ecx,(%eax)
 	movl	$-1,%eax
 	movl	$-1,%edx
-#else	/* !_THREAD_SAFE */
-	/*
-	 * Non-threaded version using global errno.
-	 */
-	.globl	CNAME(errno)
-verror:
-#ifdef PIC
-	PIC_PROLOGUE
-	movl	PIC_GOT(CNAME(errno)), %edx
-	movl	%eax,(%edx)
-	PIC_EPILOGUE
-#else
-	movl	%eax,CNAME(errno)
-#endif
-	movl	$-1,%eax
-#endif	/* !_THREAD_SAFE */
 	jmp	%ecx
 child:
 	movl	$0,%eax
diff --git a/lib/libc/i386/sys/Ovfork.S b/lib/libc/i386/sys/Ovfork.S
index e4ed257d3c33..1da267369c2a 100644
--- a/lib/libc/i386/sys/Ovfork.S
+++ b/lib/libc/i386/sys/Ovfork.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: Ovfork.S,v 1.6 1997/02/22 14:59:28 peter Exp $
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$Id: Ovfork.S,v 1.6 1997/02/22 14:59:28 peter Exp $"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "DEFS.h"
@@ -61,10 +61,7 @@ vforkok:
 	cmpl	$0,%edx		/* child process? */
 	jne	child		/* yes */
 	jmp 	parent 
-#ifdef	_THREAD_SAFE
-	/*
-	 * Threaded version using __error().
-	 */
+
 	.globl	CNAME(__error)
 	.type	CNAME(__error),@function
 verror:
@@ -78,22 +75,6 @@ verror:
 	movl	%ecx,(%eax)
 	movl	$-1,%eax
 	movl	$-1,%edx
-#else	/* !_THREAD_SAFE */
-	/*
-	 * Non-threaded version using global errno.
-	 */
-	.globl	CNAME(errno)
-verror:
-#ifdef PIC
-	PIC_PROLOGUE
-	movl	PIC_GOT(CNAME(errno)), %edx
-	movl	%eax,(%edx)
-	PIC_EPILOGUE
-#else
-	movl	%eax,CNAME(errno)
-#endif
-	movl	$-1,%eax
-#endif	/* !_THREAD_SAFE */
 	jmp	%ecx
 child:
 	movl	$0,%eax