stdio: Switch legacy stdio config defines to __

Signed-off-by: Keith Packard <[email protected]>

Author: keith-packard

CMakeLists.txt

@@ -118,9 +118,9 @@ endif()
 
 set(_ATEXIT_DYNAMIC_ALLOC 0)
 
-set(_FSEEK_OPTIMIZATION 0)
+set(__FSEEK_OPTIMIZATION 0)
 
-set(_FVWRITE_IN_STREAMIO 0)
+set(__FVWRITE_IN_STREAMIO 0)
 
 # Use bitfields in packed structs
 picolibc_flag(__HAVE_BITFIELDS_IN_PACKED_STRUCTS)
@@ -189,13 +189,13 @@ if(NOT DEFINED __MB_EXTENDED_CHARSETS_JIS)
   option(__MB_EXTENDED_CHARSETS_JIS "Enable JIS multibyte encodings" OFF)
 endif()
 
-set(_NANO_FORMATTED_IO OFF)
+set(__NANO_FORMATTED_IO OFF)
 
 option(__NANO_MALLOC "Use smaller malloc implementation" ON)
 
 set(_GLOBAL_ATEXIT OFF)
 
-set(_UNBUF_STREAM_OPT OFF)
+set(__UNBUF_STREAM_OPT OFF)
 
 if(NOT DEFINED __IO_C99_FORMATS)
   option(__IO_C99_FORMATS "Support C99 formats in printf/scanf" ON)
@@ -271,10 +271,10 @@ set(__MATH_ERRNO OFF)
 
 set(_WANT_REGISTER_FINI OFF)
 
-set(_WIDE_ORIENT OFF)
+set(__WIDE_ORIENT OFF)
 
-if(NOT DEFINED _ELIX_LEVEL)
-  set(_ELIX_LEVEL 4)
+if(NOT DEFINED __ELIX_LEVEL)
+  set(__ELIX_LEVEL 4)
 endif()
 
 # Use old math code for double funcs (0 no, 1 yes)

meson.build

@@ -435,7 +435,6 @@ if tinystdio and printf_aliases
 endif
 
 # A bunch of newlib-stdio only options
-newlib_global_stdio_streams = get_option('newlib-global-stdio-streams')
 newlib_fvwrite_in_streamio = get_option('newlib-fvwrite-in-streamio')
 newlib_fseek_optimization = get_option('newlib-fseek-optimization')
 newlib_nano_formatted_io = get_option('newlib-nano-formatted-io')
@@ -451,9 +450,6 @@ if tinystdio
   if newlib_io_float
     error('tinystdio uses a run-time mechanism to select floating point io (newlib-io-float)')
   endif
-  if newlib_global_stdio_streams
-    error('tinystdio always has (reentrant) global stdio streams (newlib-global-stdio-streams)')
-  endif
   if newlib_fvwrite_in_streamio
     error('tinystdio has no fvwrite support (newlib-fvwrite-in-streamio)')
   endif
@@ -1418,16 +1414,15 @@ if tinystdio
                 atomic_ungetc,
                 description: 'Use atomics for fgetc/ungetc for re-entrancy')
 else
-  conf_data.set('NO_FLOATING_POINT', not newlib_io_float)
-  conf_data.set('FLOATING_POINT', newlib_io_float)
-  conf_data.set('_WANT_REENT_GLOBAL_STDIO_STREAMS', newlib_global_stdio_streams)
+  conf_data.set('__IO_NO_FLOATING_POINT', not newlib_io_float)
+  conf_data.set('__IO_FLOATING_POINT', newlib_io_float)
   conf_data.set('__LARGE64_FILES', newlib_stdio64)
-  conf_data.set('_ELIX_LEVEL', newlib_elix_level)
-  conf_data.set('_FVWRITE_IN_STREAMIO', newlib_fvwrite_in_streamio)
-  conf_data.set('_FSEEK_OPTIMIZATION', newlib_fseek_optimization)
-  conf_data.set('_WIDE_ORIENT', newlib_wide_orient)
-  conf_data.set('_UNBUF_STREAM_OPT', get_option('newlib-unbuf-stream-opt'))
-  conf_data.set('_NANO_FORMATTED_IO', newlib_nano_formatted_io)
+  conf_data.set('__ELIX_LEVEL', newlib_elix_level)
+  conf_data.set('__FVWRITE_IN_STREAMIO', newlib_fvwrite_in_streamio)
+  conf_data.set('__FSEEK_OPTIMIZATION', newlib_fseek_optimization)
+  conf_data.set('__WIDE_ORIENT', newlib_wide_orient)
+  conf_data.set('__UNBUF_STREAM_OPT', get_option('newlib-unbuf-stream-opt'))
+  conf_data.set('__NANO_FORMATTED_IO', newlib_nano_formatted_io)
 endif
 
 if enable_picocrt

meson_options.txt

@@ -176,8 +176,6 @@ option('newlib-fseek-optimization', type: 'boolean', value: false,
        description: 'enable fseek optimization')
 option('newlib-fvwrite-in-streamio', type: 'boolean', value: false,
        description: 'disable iov in streamio')
-option('newlib-global-stdio-streams', type: 'boolean', value: false,
-       description: 'enable global stdio streams')
 option('newlib-io-float', type: 'boolean', value: false,
        description: 'enable printf/scanf family float support')
 option('newlib-nano-formatted-io', type: 'boolean', value: false,

newlib/ChangeLog-2015

@@ -1717,17 +1717,17 @@ summary.
 2014-07-04  Bin Cheng  <[email protected]>
 
 	* README (--enable-newlib-nano-formatted-io): Describe.
-	* acconfig.h (_NANO_FORMATTED_IO): Undef.
-	* newlib.hin (_NANO_FORMATTED_IO): Undef.
+	* acconfig.h (__NANO_FORMATTED_IO): Undef.
+	* newlib.hin (__NANO_FORMATTED_IO): Undef.
 	* configure.in (--enable-newlib-nano-formatted-io): New option.
 	* configure: Regenerated.
 	* libc/configure.in (--enable-newlib-nano-formatted-io): New option.
 	* libc/configure: Regenerated.
-	* libc/stdio/Makefile.am (NEWLIB_NANO_FORMATTED_IO): Support new
+	* libc/stdio/Makefile.am (NEWLIB__NANO_FORMATTED_IO): Support new
 	configuration option.
 	* libc/stdio/Makefile.in: Regenerated.
 	* libc/stdio/asnprintf.c (_asniprintf_r, asniprintf): Use
-	_NANO_FORMATTED_IO to declare alias prototypes.
+	__NANO_FORMATTED_IO to declare alias prototypes.
 	* libc/stdio/asprintf.c (_asiprintf_r, asiprintf): Ditto.
 	* libc/stdio/dprintf.c (_diprintf_r, diprintf): Ditto.
 	* libc/stdio/fprintf.c (_fiprintf_r, fiprintf): Ditto.
@@ -2783,8 +2783,8 @@ summary.
 
 2013-06-19  Bin Cheng  <[email protected]>
 
-	* acconfig.h (_UNBUF_STREAM_OPT): Undefine.
-	* newlib.hin (_UNBUF_STREAM_OPT): Undefine.
+	* acconfig.h (__UNBUF_STREAM_OPT): Undefine.
+	* newlib.hin (__UNBUF_STREAM_OPT): Undefine.
 	* configure.in (--enable-newlib-unbuf-stream-opt): New option.
 	* configure: Regenerate.
 	* libc/stdio/vfprintf.c (_VFPRINTF_R): Don't do optimization on
@@ -3109,11 +3109,11 @@ summary.
 
 2013-04-10  Bin Cheng  <[email protected]>
 
-	* acconfig.h (_FSEEK_OPTIMIZATION): Undef
-	* newlib.hin (_FSEEK_OPTIMIZATION): Undef
+	* acconfig.h (__FSEEK_OPTIMIZATION): Undef
+	* newlib.hin (__FSEEK_OPTIMIZATION): Undef
 	* configure.in (--disable-newlib-fseek-optimization): New option.
 	* configure: Regenerated.
-	* libc/stdio/fflush.c (__sflush_r): Use _FSEEK_OPTIMIZATION to
+	* libc/stdio/fflush.c (__sflush_r): Use __FSEEK_OPTIMIZATION to
 	control fseek optimization.
 	* libc/stdio/fseeko.c (_fseeko_r): Ditto.
 	* libc/stdio/makebuf.c (__smakebuf_r): Ditto.
@@ -3130,19 +3130,19 @@ summary.
 
 2013-03-27  Bin Cheng  <[email protected]>
 
-	* acconfig.h (_FVWRITE_IN_STREAMIO): Undefine.
-	* newlib.hin (_FVWRITE_IN_STREAMIO): Undefine.
+	* acconfig.h (__FVWRITE_IN_STREAMIO): Undefine.
+	* newlib.hin (__FVWRITE_IN_STREAMIO): Undefine.
 	* configure.in (--disable-newlib-fvwrite-in-streamio): New option.
 	* configure: Regenerated.
-	* libc/stdio/fputs.c (_fputs_r): Use _FVWRITE_IN_STREAMIO to
+	* libc/stdio/fputs.c (_fputs_r): Use __FVWRITE_IN_STREAMIO to
 	control __sfvwrite_r.  Add alternative implementation.
 	* libc/stdio/fputws.c (_fputws_r): Ditto.
 	* libc/stdio/fwrite.c (_fwrite_r): Ditto.
 	* libc/stdio/puts.c (_puts_r): Ditto.
 	* libc/stdio/vfprintf.c (__ssputs_r, __sfputs_r): New function.
-	(_VFPRINTF_R): Use _FVWRITE_IN_STREAMIO to control vector buffer.
-	(__SPRINT): Use _FVWRITE_IN_STREAMIO to control macro definition.
-	* libc/stdio/vfwprintf.c (_VFWPRINTF_R): Use _FVWRITE_IN_STREAMIO
+	(_VFPRINTF_R): Use __FVWRITE_IN_STREAMIO to control vector buffer.
+	(__SPRINT): Use __FVWRITE_IN_STREAMIO to control macro definition.
+	* libc/stdio/vfwprintf.c (_VFWPRINTF_R): Use __FVWRITE_IN_STREAMIO
 	to control vector buffer.
 
 2013-03-26  Sebastian Huber  <[email protected]>
@@ -3586,7 +3586,7 @@ summary.
 2012-08-10  Corinna Vinschen  <[email protected]>
 
 	* libc/stdio/vfwprintf.c (_VFWPRINTF_R): Fix guard around state to
-	allow usage in !FLOATING_POINT && __IO_C99_FORMATS case.
+	allow usage in !__IO_FLOATING_POINT && __IO_C99_FORMATS case.
 
 2012-08-08  Eric Blake  <[email protected]>
 
@@ -10307,7 +10307,7 @@ summary.
 2007-05-23  Eric Blake  <[email protected]>
 
 	* libc/stdio/vfscanf.c (__SVFSCANF_R): Support scanf(%1$s).
-	Avoid warning when !FLOATING_POINT.
+	Avoid warning when !__IO_FLOATING_POINT.
 	* libc/stdio/vfprintf.c (_VFPRINTF_R): Simplify _NO_POS_ARGS
 	slightly.
 
@@ -13483,7 +13483,7 @@ summary.
 
 2004-08-16  Nathan Sidwell  <[email protected]>
 
-	* libc/stdio/vfscanf.c (_NO_LONGLONG): Move out of FLOATING_POINT
+	* libc/stdio/vfscanf.c (_NO_LONGLONG): Move out of __IO_FLOATING_POINT
 	#if.
 
 2004-08-12  Jeff Johnston  <[email protected]>
@@ -14626,7 +14626,7 @@ summary.
 	* iconvdata/Makefile.am: Make dependent on newlib's configure.host
 	and set up default flags to pass to aclocal.
 	* iconvdata/Makefile.in: Regenerated.
-	* libc/sys/linux/Makefile.am: Add _ELIX_LEVEL_4 getlogin, getpwnam,
+	* libc/sys/linux/Makefile.am: Add __ELIX_LEVEL_4 getlogin, getpwnam,
 	and getpwuid routines.
 	* libc/sys/linux/Makefile.in: Regenerated.
 	* libc/sys/linux/getlogin.c: New stub file to allow x86-linux
@@ -14637,7 +14637,7 @@ summary.
 	that were formerly supplied by /usr/include/linux/types.h with
 	kernel types.
 	* testsuite/newlib.wctype/twctype.c: Fix testcase to properly
-	test _ELIX_LEVEL macro.
+	test __ELIX_LEVEL macro.
 
 2003-11-07  Jeff Johnston  <[email protected]>
 
@@ -14848,7 +14848,7 @@ summary.
 
 2003-09-04  Ben Elliston  <[email protected]>
 
-	* libc/stdlib/mstats.c[_ELIX_LEVEL]: Fix guards.  #ifndef FOO ||
+	* libc/stdlib/mstats.c[__ELIX_LEVEL]: Fix guards.  #ifndef FOO ||
 	FOO >= 2 is invalid; use #if !defined (FOO) || FOO >= 2 instead.
 
 2003-09-02  Thomas Pfaff  <[email protected]>
@@ -16767,14 +16767,14 @@ Thu Apr  3 14:01:16 2003  J"orn Rennecke <[email protected]>
 
 2002-08-27  Jeff Johnston  <[email protected]>
 
-	* configure.host: Remove _ELIX_LEVEL flag setting.
+	* configure.host: Remove __ELIX_LEVEL flag setting.
 	* Makefile.am(stmp-targ-include): Copy newlib.h to targ-include.
 	(install-data-local): Install newlib.h.
 	* Makefile.in: Regenerated.
 	* aclocal.m4: Ditto.
 	* configure: Ditto.
 	* configure.in: Add AM_CONFIG_HEADER to generate newlib.h based on
-	newlib.hin.  Add AC_DEFINE_UNQUOTED entries for _ELIX_LEVEL
+	newlib.hin.  Add AC_DEFINE_UNQUOTED entries for __ELIX_LEVEL
 	and _NEWLIB_VERSION to fill in newlib.h header file entries.
 	In AC_OUTPUT statement, unset ac_file so multilib support does
 	not use last ac_file temporary used in newlib.h configuration.
@@ -16793,7 +16793,7 @@ Thu Apr  3 14:01:16 2003  J"orn Rennecke <[email protected]>
 	* acinclude.m4: Add support for --enable-newlib-elix-level option.
 	* aclocal.m4: Regenerated.
 	* configure: Ditto.
-	* configure.host: Add code to define _ELIX_LEVEL if
+	* configure.host: Add code to define __ELIX_LEVEL if
 	--enable-newlib-elix-level option is used.
 	* configure.in:
 	* libc/aclocal.m4: Regenerated.
@@ -18957,16 +18957,16 @@ Wed Mar  6 10:24:26 2002  J"orn Rennecke <[email protected]>
 2002-02-27  Jeff Johnston  <[email protected]>
 
 	* configure.host: Add check for --disable-newlib-io-float
-	configuration option and add -DNO_FLOATING_POINT to newlib cflags
+	configuration option and add -D__IO_NO_FLOATING_POINT to newlib cflags
 	if appropriate.
 	* acinclude.m4: Added --disable-newlib-io-float option.
 	* aclocal.m4: Regenerated.
 	* configure: Ditto.
 	* doc/aclocal.m4 doc/configure libc/aclocal.m4 libc/configure
 	* libc/*/aclocal.m4 libc/*/configure
 	* libm/*/aclocal.m4 libm/*/configure: Ditto.
-	* libc/stdio/vfprintf.c [!INTEGER_ONLY]: Only set FLOATING_POINT
-	if NO_FLOATING_POINT flag is not defined.
+	* libc/stdio/vfprintf.c [!INTEGER_ONLY]: Only set __IO_FLOATING_POINT
+	if __IO_NO_FLOATING_POINT flag is not defined.
 
 2002-02-25  Jeff Johnston  <[email protected]>
 

newlib/libc/stdio/fflush.c

@@ -111,7 +111,7 @@ _sflush (
   flags = fp->_flags;
   if ((flags & __SWR) == 0)
     {
-#ifdef _FSEEK_OPTIMIZATION
+#ifdef __FSEEK_OPTIMIZATION
       /* For a read stream, an fflush causes the next seek to be
          unoptimized (i.e. forces a system-level seek).  This conforms
          to the POSIX and SUSv3 standards.  */
@@ -185,7 +185,7 @@ _sflush (
 	    {
 	      /* Seek successful or ignorable error condition.
 		 We can clear read buffer now.  */
-#ifdef _FSEEK_OPTIMIZATION
+#ifdef __FSEEK_OPTIMIZATION
 	      fp->_flags &= ~__SNPT;
 #endif
 	      fp->_r = 0;

newlib/libc/stdio/fputs.c

@@ -90,7 +90,7 @@ fputs (
        char const *__restrict s,
        FILE *__restrict fp)
 {
-#ifdef _FVWRITE_IN_STREAMIO
+#ifdef __FVWRITE_IN_STREAMIO
   int result;
   struct __suio uio;
   struct __siov iov;

newlib/libc/stdio/fputws.c

@@ -99,7 +99,7 @@ fputws (
 {
   size_t nbytes;
   char buf[BUFSIZ];
-#ifdef _FVWRITE_IN_STREAMIO
+#ifdef __FVWRITE_IN_STREAMIO
   struct __suio uio;
   struct __siov iov;
 

newlib/libc/stdio/fseeko.c

@@ -98,7 +98,7 @@ fseeko (
        int whence)
 {
   _fpos_t (*seekfn) (void *, _fpos_t, int);
-#ifdef _FSEEK_OPTIMIZATION
+#ifdef __FSEEK_OPTIMIZATION
   _fpos_t target;
   size_t n;
 #ifdef __USE_INTERNAL_STAT64
@@ -198,7 +198,7 @@ fseeko (
   if (fp->_bf._base == NULL)
     _smakebuf ( fp);
 
-#ifdef _FSEEK_OPTIMIZATION
+#ifdef __FSEEK_OPTIMIZATION
   if (fp->_flags & (__SWR | __SRW | __SNBF | __SNPT))
     goto dumb;
   if ((fp->_flags & __SOPT) == 0)

newlib/libc/stdio/fwrite.c

@@ -115,7 +115,7 @@ fwrite (
        FILE * __restrict fp)
 {
   size_t n;
-#ifdef _FVWRITE_IN_STREAMIO
+#ifdef __FVWRITE_IN_STREAMIO
   struct __suio uio;
   struct __siov iov;
 

newlib/libc/stdio/local.h

@@ -225,7 +225,7 @@ extern void (*_stdio_cleanup)(void);
 #define	FREELB(ptr, fp) { free((char *)(fp)->_lb._base);	\
       (fp)->_lb._base = NULL; }
 
-#ifdef _WIDE_ORIENT
+#ifdef __WIDE_ORIENT
 /*
  * Set the orientation for a stream. If o > 0, the stream has wide-
  * orientation. If o < 0, the stream has byte-orientation.
@@ -353,7 +353,7 @@ extern const __CH_CLASS __chclass[256];
 extern const __STATE __state_table[MAX_STATE][MAX_CH_CLASS];
 extern const __ACTION __action_table[MAX_STATE][MAX_CH_CLASS];
 
-#if defined(_NANO_FORMATTED_IO) && defined(__strong_reference)
+#if defined(__NANO_FORMATTED_IO) && defined(__strong_reference)
 #define __nano_reference(a,b) __strong_reference(a,b)
 #else
 #define __nano_reference(a,b)