summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/include/cygwin/config.h2
-rw-r--r--winsup/cygwin/thread.cc7
2 files changed, 7 insertions, 2 deletions
diff --git a/winsup/cygwin/include/cygwin/config.h b/winsup/cygwin/include/cygwin/config.h
index c09641ed1..46c020897 100644
--- a/winsup/cygwin/include/cygwin/config.h
+++ b/winsup/cygwin/include/cygwin/config.h
@@ -35,7 +35,6 @@ extern "C" {
compute these offsets already exists for the sake of gendef so
we might as well just use it here. */
-#ifdef _COMPILING_NEWLIB
#ifdef __x86_64__
#include "../tlsoffsets64.h"
#else
@@ -52,7 +51,6 @@ extern inline struct _reent *__getreent (void)
#endif
return (struct _reent *) (ret + tls_local_clib);
}
-#endif /* _COMPILING_NEWLIB */
#ifdef __x86_64__
# define __SYMBOL_PREFIX
diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc
index d9271fc4b..4414785ad 100644
--- a/winsup/cygwin/thread.cc
+++ b/winsup/cygwin/thread.cc
@@ -80,6 +80,13 @@ pthread_mutex::no_owner()
return res;
}
+#undef __getreent
+extern "C" struct _reent *
+__getreent ()
+{
+ return &_my_tls.local_clib;
+}
+
extern "C" void
__cygwin_lock_init (_LOCK_T *lock)
{