* 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.

diff --git a/ChangeLog b/ChangeLog
index b37a47deecb00af369cf532cf6bb46dd653dd763..4b04f03ffd2baf90950ebb2e4b16edcc603faa10 100644 (file)
--- 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 032b48306c0824961c7a9aee4b1f4472bae93112..8332a46ad7721b08ec2d4b0b78b388e5c4e018ec 100644 (file)
--- 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;