From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1921) id 0DF093876079; Fri, 13 May 2022 11:19:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0DF093876079 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] Add two __sglue initialization macros X-Act-Checkin: newlib-cygwin X-Git-Author: Matt Joyce X-Git-Refname: refs/heads/master X-Git-Oldrev: d041db379241a4fd668401f374429099e5a16a48 X-Git-Newrev: e5e36867f851b7355e6221a598f604bcae52597f Message-Id: <20220513111942.0DF093876079@sourceware.org> Date: Fri, 13 May 2022 11:19:42 +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:19:42 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3De5e36867f85= 1b7355e6221a598f604bcae52597f commit e5e36867f851b7355e6221a598f604bcae52597f Author: Matt Joyce Date: Tue Apr 5 11:40:19 2022 +0200 Add two __sglue initialization macros =20 Added _REENT_INIT_SGLUE and _REENT_INIT_SGLUE_ZEROED macros to initialize __sglue member of struct _reent. This allows further simplification of __sinit() and facilitates the removal of __sglue as a member of struct _reent for certain configurations in a follow-on patch. Diff: --- newlib/libc/include/sys/reent.h | 9 ++++++++- newlib/libc/stdio/findfp.c | 7 +------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reen= t.h index e0b0ccffb..4b0d68610 100644 --- a/newlib/libc/include/sys/reent.h +++ b/newlib/libc/include/sys/reent.h @@ -702,8 +702,14 @@ struct _reent =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_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_ZEROED(_ptr) \ + (_ptr)->__sglue._niobs =3D 3; \ + (_ptr)->__sglue._iobs =3D &(_ptr)->__sf[0]; #endif =20 #define _REENT_INIT(var) \ @@ -751,7 +757,7 @@ struct _reent }, \ _REENT_INIT_ATEXIT \ _NULL, \ - {_NULL, 0, _NULL} \ + _REENT_INIT_SGLUE(&(var)) \ } =20 #define _REENT_INIT_PTR_ZEROED(var) \ @@ -766,6 +772,7 @@ struct _reent (var)->_new._reent._r48._mult[1] =3D _RAND48_MULT_1; \ (var)->_new._reent._r48._mult[2] =3D _RAND48_MULT_2; \ (var)->_new._reent._r48._add =3D _RAND48_ADD; \ + _REENT_INIT_SGLUE_ZEROED(var) \ } =20 #define _REENT_CHECK_RAND48(ptr) /* nothing */ diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c index 8327b1992..66867e664 100644 --- a/newlib/libc/stdio/findfp.c +++ b/newlib/libc/stdio/findfp.c @@ -246,12 +246,7 @@ __sinit (struct _reent *s) /* make sure we clean up on exit */ s->__cleanup =3D cleanup_stdio; /* conservative */ =20 -#ifndef _REENT_SMALL -# ifndef _REENT_GLOBAL_STDIO_STREAMS - s->__sglue._niobs =3D 3; - s->__sglue._iobs =3D &s->__sf[0]; -# endif /* _REENT_GLOBAL_STDIO_STREAMS */ -#else +#ifdef _REENT_SMALL # ifndef _REENT_GLOBAL_STDIO_STREAMS s->_stdin =3D __sfp(s); s->_stdout =3D __sfp(s);