From cfbc71d7ddf4393f00ff210998fe60f2464852b0 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Sat, 2 Nov 2002 01:53:44 +0000
Subject: [PATCH] * sysdeps/generic/errno-loc.c [! USE___THREAD]: Use this
 conditional

	in place of [!(USE_TLS && HAVE___THREAD)].
	(__errno_location) [! USE___THREAD]: Define as strong, not weak.
---
 ChangeLog                   | 6 ++++++
 sysdeps/generic/errno-loc.c | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b37a47deec..4b04f03ffd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-01  Roland McGrath  <roland@redhat.com>
+
+	* sysdeps/generic/errno-loc.c [! USE___THREAD]: Use this conditional
+	in place of [!(USE_TLS && HAVE___THREAD)].
+	(__errno_location) [! USE___THREAD]: Define as strong, not weak.
+
 2002-10-31  Roger Sayle  <roger@eyesopen.com>
 
 	* sysdeps/i386/soft-fp/sfp-machine.h (_FP_NANFRAC_Q, _FP_NANSIGN_Q):
diff --git a/sysdeps/generic/errno-loc.c b/sysdeps/generic/errno-loc.c
index 032b48306c..8332a46ad7 100644
--- a/sysdeps/generic/errno-loc.c
+++ b/sysdeps/generic/errno-loc.c
@@ -21,13 +21,15 @@
 #include <errno.h>
 #include <tls.h>
 
-#if !(USE_TLS && HAVE___THREAD)
+#if ! USE___THREAD
 #undef errno
 extern int errno;
 #endif
 
 int *
+#if ! USE___THREAD
 weak_const_function
+#endif
 __errno_location (void)
 {
   return &errno;
-- 
2.43.5