From ea8a3d42ab21f5184b89f8b2f2872bc73e0f0f02 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@redhat.com>
Date: Tue, 6 Feb 2001 19:17:20 +0000
Subject: [PATCH] 2001-02-06  Will Cohen  <wcohen@redhat.com>

        * rs6000/sim-errno.c (__errno): Removed.
        (_cerror): Use re-entrant version of errno.
---
 libgloss/ChangeLog          |  5 +++++
 libgloss/rs6000/sim-errno.c | 11 +++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog
index 875e1d5ea..46eeaea21 100644
--- a/libgloss/ChangeLog
+++ b/libgloss/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-06  Will Cohen  <wcohen@redhat.com>
+
+        * rs6000/sim-errno.c (__errno): Removed.
+        (_cerror): Use re-entrant version of errno.
+
 2000-09-05  Geoff Keating  <geoffk@cygnus.com>
 
 	* rs6000/simulator.S: Use conditional returns for documentation
diff --git a/libgloss/rs6000/sim-errno.c b/libgloss/rs6000/sim-errno.c
index 9a771b4d0..29cb4a2be 100644
--- a/libgloss/rs6000/sim-errno.c
+++ b/libgloss/rs6000/sim-errno.c
@@ -14,13 +14,8 @@
  * they apply.
  */
 
-int errno;
-
-int *
-__errno ()
-{
-  return &errno;
-}
+#include <errno.h>
+#include <reent.h>
 
 /* syscall handler branches here in case of error. */
 
@@ -28,6 +23,6 @@ int
 _cerror (e)
      int e;
 {
-  errno = e;
+  _REENT->_errno = e;
   return -1;
 }