public inbox for newlib@sourceware.org
 help / color / mirror / Atom feed
From: Matthew Joyce <matthew.joyce@embedded-brains.de>
To: newlib@sourceware.org
Subject: [PATCH v2 03/11] Declare global __sf[] only once
Date: Thu, 12 May 2022 14:11:35 +0200	[thread overview]
Message-ID: <20220512121143.21473-4-matthew.joyce@embedded-brains.de> (raw)
In-Reply-To: <20220512121143.21473-1-matthew.joyce@embedded-brains.de>

From: Sebastian Huber <sebastian.huber@embedded-brains.de>

Reduced number of global __sf[] declarations from two to one,
simplifying initializations in sys/reent.h.
---
 newlib/libc/include/sys/reent.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
index 4bc78a447..e0b0ccffb 100644
--- a/newlib/libc/include/sys/reent.h
+++ b/newlib/libc/include/sys/reent.h
@@ -293,6 +293,10 @@ typedef struct __sFILE   __FILE;
 #endif /* __LARGE64_FILES */
 #endif /* !__CUSTOM_FILE_IO__ */
 
+#ifdef _REENT_GLOBAL_STDIO_STREAMS
+extern __FILE __sf[3];
+#endif
+
 struct _glue
 {
   struct _glue *_next;
@@ -426,7 +430,6 @@ struct _reent
 };
 
 #ifdef _REENT_GLOBAL_STDIO_STREAMS
-extern __FILE __sf[3];
 
 # define _REENT_INIT(var) \
   { 0, \
@@ -698,7 +701,6 @@ struct _reent
 };
 
 #ifdef _REENT_GLOBAL_STDIO_STREAMS
-extern __FILE __sf[3];
 #define _REENT_STDIO_STREAM(var, index) &__sf[index]
 #else
 #define _REENT_STDIO_STREAM(var, index) &(var)->__sf[index]
-- 
2.31.1


  parent reply	other threads:[~2022-05-12 12:11 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-12 12:11 [PATCH v2 00/11] Decouple global file object list from _GLOBAL_REENT Matthew Joyce
2022-05-12 12:11 ` [PATCH v2 01/11] Remove duplicate stdio initializations Matthew Joyce
2022-05-12 12:11 ` [PATCH v2 02/11] Remove duplicate sglue initializations Matthew Joyce
2022-05-12 12:11 ` Matthew Joyce [this message]
2022-05-12 12:11 ` [PATCH v2 04/11] Add two __sglue initialization macros Matthew Joyce
2022-05-12 12:11 ` [PATCH v2 05/11] Remove __sinit_locks / __sinit_recursive_mutex Matthew Joyce
2022-05-12 13:25   ` Torbjorn SVENSSON
2022-05-12 13:51     ` Sebastian Huber
2022-05-12 12:11 ` [PATCH v2 06/11] Move __sglue initializations to __sfp() Matthew Joyce
2022-05-12 12:11 ` [PATCH v2 07/11] Add CLEANUP_FILE define Matthew Joyce
2022-05-12 12:11 ` [PATCH v2 08/11] Add stdio_exit_handler() Matthew Joyce
2022-05-12 19:11   ` Corinna Vinschen
2022-05-17  8:36   ` Takashi Yano
2022-05-17 10:13     ` Sebastian Huber
2022-05-12 12:11 ` [PATCH v2 09/11] stdio: Replace _fwalk_reent() with _fwalk_sglue() Matthew Joyce
2022-05-12 12:11 ` [PATCH v2 10/11] Add global __sglue object for all configurations Matthew Joyce
2022-05-12 12:11 ` [PATCH v2 11/11] Remove __sglue member for one configuration Matthew Joyce
2022-05-12 19:09   ` Corinna Vinschen
2022-05-12 19:14 ` [PATCH v2 00/11] Decouple global file object list from _GLOBAL_REENT Corinna Vinschen
2022-05-12 19:44   ` Corinna Vinschen
2022-05-13  5:44     ` Sebastian Huber
2022-05-13  7:53       ` Corinna Vinschen
2022-05-13 10:54     ` Sebastian Huber
2022-05-13 11:20       ` Corinna Vinschen
2022-05-13  8:03   ` Corinna Vinschen
2022-05-13 11:20     ` Sebastian Huber
2022-05-13 11:30       ` Corinna Vinschen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220512121143.21473-4-matthew.joyce@embedded-brains.de \
    --to=matthew.joyce@embedded-brains.de \
    --cc=newlib@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).