JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reinstantiate Cygwin function called `__getreent'

Browse Source 
This partially reverts commit 10a30e7 as far as the Cygwin version of
the __getreent function is concerned.  Remove _COMPILING_NEWLIB guard
only allowing to use __getreent inline function when building newlib,
since we wan to use it in Cygwin as well.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Signed-off-by: Stefan Assmann <sassmann@redhat.com>
This commit is contained in:
Corinna Vinschen
2016-08-18 14:27:05 +02:00
parent 3bbc40af2a
commit 6f3943bca1
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
winsup/cygwin/include/cygwin/config.h
View File

@@ -35,7 +35,6 @@ extern "C" {
compute these offsets already exists for the sake of gendef so compute these offsets already exists for the sake of gendef so
we might as well just use it here. */ we might as well just use it here. */
#ifdef _COMPILING_NEWLIB
#ifdef __x86_64__ #ifdef __x86_64__
#include "../tlsoffsets64.h" #include "../tlsoffsets64.h"
#else #else
@@ -52,7 +51,6 @@ extern inline struct _reent *__getreent (void)
#endif #endif
return (struct _reent *) (ret + tls_local_clib); return (struct _reent *) (ret + tls_local_clib);
} }
#endif /* _COMPILING_NEWLIB */
#ifdef __x86_64__ #ifdef __x86_64__
# define __SYMBOL_PREFIX # define __SYMBOL_PREFIX

7
winsup/cygwin/thread.cc
View File

@@ -80,6 +80,13 @@ pthread_mutex::no_owner()
return res; return res;
} }
#undef __getreent
extern "C" struct _reent *
__getreent ()
{
return &_my_tls.local_clib;
}
extern "C" void extern "C" void
__cygwin_lock_init (_LOCK_T *lock) __cygwin_lock_init (_LOCK_T *lock)
{ {