From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1921) id 40100383D82A; Fri, 13 May 2022 11:20:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 40100383D82A Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Sebastian Huber To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] Remove __sglue member for one configuration X-Act-Checkin: newlib-cygwin X-Git-Author: Matt Joyce X-Git-Refname: refs/heads/master X-Git-Oldrev: 8b96542ed18990c9300daa4faba89ce8227b4482 X-Git-Newrev: 0a862d13193616811ce897e2bd50ca3003b47f84 Message-Id: <20220513112017.40100383D82A@sourceware.org> Date: Fri, 13 May 2022 11:20:17 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 May 2022 11:20:17 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D0a862d13193= 616811ce897e2bd50ca3003b47f84 commit 0a862d13193616811ce897e2bd50ca3003b47f84 Author: Matt Joyce Date: Mon May 2 09:00:12 2022 +0200 Remove __sglue member for one configuration =20 Remove __sglue member of struct reent when _REENT_GLOBAL_STDIO_STREAMS = is defined. Diff: --- newlib/libc/include/sys/reent.h | 8 ++++---- newlib/libc/reent/reent.c | 4 ++++ newlib/libc/stdio/fcloseall.c | 5 +++++ newlib/libc/stdio/findfp.c | 9 ++++++++- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reen= t.h index 44a671079..fa9ac57da 100644 --- a/newlib/libc/include/sys/reent.h +++ b/newlib/libc/include/sys/reent.h @@ -696,19 +696,19 @@ struct _reent /* These are here last so that __FILE can grow without changing the offs= ets of the above members (on the off chance that future binary compatibil= ity would be broken otherwise). */ - struct _glue __sglue; /* root of glue chain */ # ifndef _REENT_GLOBAL_STDIO_STREAMS + struct _glue __sglue; /* root of glue chain */ __FILE __sf[3]; /* first three file descriptors */ # endif }; =20 #ifdef _REENT_GLOBAL_STDIO_STREAMS #define _REENT_STDIO_STREAM(var, index) &__sf[index] -#define _REENT_INIT_SGLUE(_ptr) { _NULL, 0, _NULL } +#define _REENT_INIT_SGLUE(_ptr) /* nothing to initialize */ #define _REENT_INIT_SGLUE_ZEROED(_ptr) /* nothing to set */ #else #define _REENT_STDIO_STREAM(var, index) &(var)->__sf[index] -#define _REENT_INIT_SGLUE(_ptr) { _NULL, 3, &(_ptr)->__sf[0] } +#define _REENT_INIT_SGLUE(_ptr) , { _NULL, 3, &(_ptr)->__sf[0] } #define _REENT_INIT_SGLUE_ZEROED(_ptr) \ (_ptr)->__sglue._niobs =3D 3; \ (_ptr)->__sglue._iobs =3D &(_ptr)->__sf[0]; @@ -758,7 +758,7 @@ struct _reent } \ }, \ _REENT_INIT_ATEXIT \ - _NULL, \ + _NULL \ _REENT_INIT_SGLUE(&(var)) \ } =20 diff --git a/newlib/libc/reent/reent.c b/newlib/libc/reent/reent.c index 5a04fcf62..0bdd8aa62 100644 --- a/newlib/libc/reent/reent.c +++ b/newlib/libc/reent/reent.c @@ -27,6 +27,7 @@ int errno; =20 #endif =20 +#ifndef _REENT_GLOBAL_STDIO_STREAMS /* Interim cleanup code */ =20 void @@ -39,6 +40,7 @@ cleanup_glue (struct _reent *ptr, =20 _free_r (ptr, glue); } +#endif =20 void _reclaim_reent (struct _reent *ptr) @@ -124,8 +126,10 @@ _reclaim_reent (struct _reent *ptr) before the program exits, and who wants to wait for that? */ ptr->__cleanup (ptr); =20 +#ifndef _REENT_GLOBAL_STDIO_STREAMS if (ptr->__sglue._next) cleanup_glue (ptr, ptr->__sglue._next); +#endif } =20 /* Malloc memory not reclaimed; no good way to return memory anyway.= */ diff --git a/newlib/libc/stdio/fcloseall.c b/newlib/libc/stdio/fcloseall.c index f14c28d34..642dc7d94 100644 --- a/newlib/libc/stdio/fcloseall.c +++ b/newlib/libc/stdio/fcloseall.c @@ -59,7 +59,12 @@ Required OS subroutines: <>, <>, <= >, <>, int _fcloseall_r (struct _reent *ptr) { +#ifdef _REENT_GLOBAL_STDIO_STREAMS + /* There are no thread-specific FILE objects */ + return 0; +#else return _fwalk_sglue (ptr, _fclose_r, &ptr->__sglue); +#endif } =20 #ifndef _REENT_ONLY diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c index 29c068a12..19952d4e0 100644 --- a/newlib/libc/stdio/findfp.c +++ b/newlib/libc/stdio/findfp.c @@ -242,8 +242,9 @@ cleanup_stdio (struct _reent *ptr) CLEANUP_FILE (ptr, ptr->_stdout); if (ptr->_stderr !=3D &__sf[2]) CLEANUP_FILE (ptr, ptr->_stderr); -#endif +#else (void) _fwalk_sglue (ptr, CLEANUP_FILE, &ptr->__sglue); +#endif } =20 /* @@ -326,21 +327,27 @@ __fp_unlock (struct _reent * ptr __unused, FILE * fp) void __fp_lock_all (void) { +#ifndef _REENT_GLOBAL_STDIO_STREAMS struct _reent *ptr; +#endif =20 __sfp_lock_acquire (); =20 +#ifndef _REENT_GLOBAL_STDIO_STREAMS ptr =3D _REENT; (void) _fwalk_sglue (ptr, __fp_lock, &ptr->__sglue); +#endif } =20 void __fp_unlock_all (void) { +#ifndef _REENT_GLOBAL_STDIO_STREAMS struct _reent *ptr; =20 ptr =3D _REENT; (void) _fwalk_sglue (ptr, __fp_unlock, &ptr->__sglue); +#endif =20 __sfp_lock_release (); }