uchar: Remove thread locale annotation from static mbstate_t vars

keith-packard · keith-packard · commit 82392249f7fb · 2025-02-05T15:10:44.000-08:00
The spec doesn't require that these state values be thread local,
and that wastes memory for applications using them as intended.

Signed-off-by: Keith Packard &lt;keithp@keithp.com&gt;
diff --git a/newlib/libc/uchar/c16rtomb.c b/newlib/libc/uchar/c16rtomb.c
@@ -38,7 +38,7 @@
 size_t
 c16rtomb (char *s, char16_t c16, mbstate_t *ps)
 {
-    static NEWLIB_THREAD_LOCAL mbstate_t local_state;
+    static mbstate_t local_state;
 
     if (ps == NULL)
         ps = &local_state;
diff --git a/newlib/libc/uchar/c32rtomb.c b/newlib/libc/uchar/c32rtomb.c
@@ -38,7 +38,7 @@
 size_t
 c32rtomb (char *s, char32_t c32, mbstate_t *ps)
 {
-    static NEWLIB_THREAD_LOCAL mbstate_t local_state;
+    static mbstate_t local_state;
 
     if (ps == NULL)
         ps = &local_state;
diff --git a/newlib/libc/uchar/c8rtomb.c b/newlib/libc/uchar/c8rtomb.c
@@ -38,7 +38,7 @@
 size_t
 c8rtomb (char *s, char8_t c8, mbstate_t *ps)
 {
-    static NEWLIB_THREAD_LOCAL mbstate_t _state;
+    static mbstate_t _state;
     char32_t    c32;
     int count;
 
diff --git a/newlib/libc/uchar/mbrtoc16.c b/newlib/libc/uchar/mbrtoc16.c
@@ -39,7 +39,7 @@ size_t
 mbrtoc16(char16_t * __restrict pc16, const char * __restrict s, size_t n,
          _mbstate_t * __restrict ps)
 {
-    static NEWLIB_THREAD_LOCAL mbstate_t local_state;
+    static mbstate_t local_state;
 
     if (ps == NULL)
         ps = &local_state;
diff --git a/newlib/libc/uchar/mbrtoc32.c b/newlib/libc/uchar/mbrtoc32.c
@@ -38,7 +38,7 @@
 size_t mbrtoc32(char32_t * __restrict pc32, const char * __restrict s, size_t n,
                 _mbstate_t * __restrict ps)
 {
-    static NEWLIB_THREAD_LOCAL mbstate_t local_state;
+    static mbstate_t local_state;
 
     if (ps == NULL)
         ps = &local_state;
diff --git a/newlib/libc/uchar/mbrtoc8.c b/newlib/libc/uchar/mbrtoc8.c
@@ -39,7 +39,7 @@ size_t
 mbrtoc8(char8_t * __restrict pc8, const char * __restrict s, size_t n,
         mbstate_t * __restrict ps)
 {
-    static NEWLIB_THREAD_LOCAL mbstate_t local_state;
+    static mbstate_t local_state;
 
     if (ps == NULL)
         ps = &local_state;

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`size_t`
`39`	`39`	`c16rtomb (char s, char16_t c16, mbstate_t ps)`
`40`	`40`	`{`
`41`		`- static NEWLIB_THREAD_LOCAL mbstate_t local_state;`
	`41`	`+ static mbstate_t local_state;`
`42`	`42`
`43`	`43`	`if (ps == NULL)`
`44`	`44`	`ps = &local_state;`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ size_t`
`39`	`39`	`mbrtoc16(char16_t * __restrict pc16, const char * __restrict s, size_t n,`
`40`	`40`	`_mbstate_t * __restrict ps)`
`41`	`41`	`{`
`42`		`- static NEWLIB_THREAD_LOCAL mbstate_t local_state;`
	`42`	`+ static mbstate_t local_state;`
`43`	`43`
`44`	`44`	`if (ps == NULL)`
`45`	`45`	`ps = &local_state;`