diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2016-08-18 14:26:42 +0200 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2016-08-18 15:24:18 +0200 |
| commit | 3bbc40af2aa41c12e73ac4f6bc1b9c56554e59c6 (patch) | |
| tree | 21a7b4f19d40c0213a9eb86b935a427a3f772d20 | |
| parent | eb61113daf84bea95b81551b4c3826d4574c5688 (diff) | |
| download | cygnal-3bbc40af2aa41c12e73ac4f6bc1b9c56554e59c6.tar.gz cygnal-3bbc40af2aa41c12e73ac4f6bc1b9c56554e59c6.tar.bz2 cygnal-3bbc40af2aa41c12e73ac4f6bc1b9c56554e59c6.zip | |
Revert "Fix __getreent function for Cygwin"
This reverts commit 4de8596. It worked around a problem which was
actually introduced by patch 10a30e7 a few weeks ago. Rather than
adding special code to the newlib version of __getreent, the followup
patch reinstantiates the original, Cygwin-only implementation of
__getreent.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Signed-off-by: Stefan Assmann <sassmann@redhat.com>
| -rw-r--r-- | newlib/libc/reent/getreent.c | 7 | ||||
| -rw-r--r-- | winsup/cygwin/include/cygwin/config.h | 3 |
2 files changed, 2 insertions, 8 deletions
diff --git a/newlib/libc/reent/getreent.c b/newlib/libc/reent/getreent.c index 176923226..60ae6fbb7 100644 --- a/newlib/libc/reent/getreent.c +++ b/newlib/libc/reent/getreent.c @@ -1,4 +1,5 @@ /* default reentrant pointer when multithread enabled */ + #include <_ansi.h> #include <reent.h> @@ -9,11 +10,5 @@ struct _reent * _DEFUN_VOID(__getreent) { -#ifdef __CYGWIN__ - /* Utilize Cygwin's inline definition from include/cygwin/config.h - (note the extra underscore) */ - return __inline_getreent (); -#else return _impure_ptr; -#endif } diff --git a/winsup/cygwin/include/cygwin/config.h b/winsup/cygwin/include/cygwin/config.h index 585a2567f..c09641ed1 100644 --- a/winsup/cygwin/include/cygwin/config.h +++ b/winsup/cygwin/include/cygwin/config.h @@ -42,7 +42,7 @@ extern "C" { #include "../tlsoffsets.h" #endif __attribute__((gnu_inline)) -extern inline struct _reent *__inline_getreent (void) +extern inline struct _reent *__getreent (void) { register char *ret; #ifdef __x86_64__ @@ -52,7 +52,6 @@ extern inline struct _reent *__inline_getreent (void) #endif return (struct _reent *) (ret + tls_local_clib); } -#define __getreent() __inline_getreent() #endif /* _COMPILING_NEWLIB */ #ifdef __x86_64__ |