Resolve review comments to:

- Use private types in all public headers so that `stddef.h` isn't required. - Fix the default value of `RSIZE_MAX`. - Remove duplicate definition of `set_constraint_handler_s`. Signed-off-by: Mostafa Salman <[email protected]>
foss-for-synopsys-dwc-arc-processors · Jun 24, 2024 · 9114c82 · 9114c82
1 parent 0492c2a
commit 9114c82
Show file tree

Hide file tree

Showing 36 changed files with 374 additions and 847 deletions.
diff --git a/newlib/libc/include/errno.h b/newlib/libc/include/errno.h
@@ -37,18 +37,10 @@ SUCH DAMAGE.
 #ifndef __error_t_defined
 typedef int error_t;
 
-#ifdef __STDC_WANT_LIB_EXT1__
-#if (__STDC_WANT_LIB_EXT1__ != 0) && (__STDC_WANT_LIB_EXT1__ != 1)
-#error Please define __STDC_WANT_LIB_EXT__ as 0 or 1
-#endif
-#if __STDC_WANT_LIB_EXT1__ == 1
-typedef int errno_t;
-#endif
-#endif
-
 #define __error_t_defined 1
 #endif
 
 #include <sys/errno.h>
+#include <sys/_types.h>
 
 #endif /* !__ERRNO_H__ */
diff --git a/newlib/libc/include/stdint.h b/newlib/libc/include/stdint.h
@@ -458,22 +458,15 @@ typedef __uint_least64_t uint_least64_t;
 #endif
 #endif
 
-#ifdef __STDC_WANT_LIB_EXT1__
-#if (__STDC_WANT_LIB_EXT1__ != 0) && (__STDC_WANT_LIB_EXT1__ != 1)
-#error Please define __STDC_WANT_LIB_EXT__ as 0 or 1
-#endif
-
 #if __STDC_WANT_LIB_EXT1__ == 1
-    #include <stddef.h>
-    #ifndef __RSIZE_T
-    #define __RSIZE_T
-    typedef size_t rsize_t;
+    #include <sys/_types.h>
+
+    // could be defined by the user
+    #ifndef RSIZE_MAX
+    #define RSIZE_MAX SIZE_MAX
     #endif
 
-    extern rsize_t _set_rsize_max_s(rsize_t);
-    extern rsize_t _get_rsize_max_s(void);
-    #define RSIZE_MAX (_get_rsize_max_s())
-#endif
+    typedef __rsize_t rsize_t;
 #endif
 
 

diff --git a/newlib/libc/include/stdlib.h b/newlib/libc/include/stdlib.h
@@ -384,26 +384,21 @@ _Noreturn void
 #endif /* __ISO_C_VISIBLE >= 2011 */
 
 
-#ifdef __STDC_WANT_LIB_EXT1__
-#if (__STDC_WANT_LIB_EXT1__ != 0) && (__STDC_WANT_LIB_EXT1__ != 1)
-#error Please define __STDC_WANT_LIB_EXT__ as 0 or 1
-#endif
-
 #if __STDC_WANT_LIB_EXT1__ == 1
-#include <errno.h>
+#include <sys/_types.h>
+
+typedef __errno_t errno_t;
 
 typedef void (*constraint_handler_t)(
         const char *restrict msg, void *restrict ptr, errno_t error);
 
-extern constraint_handler_t * ___pcur_handler(void);
-#define cur_handler (*___pcur_handler())
+extern constraint_handler_t __cur_handler;
 
 extern constraint_handler_t set_constraint_handler_s(
         constraint_handler_t handler);
-extern void ignore_handler_s(
+extern void abort_handler_s(
         const char *restrict msg, void *restrict ptr, errno_t error);
 #endif
-#endif
 
 
 _END_STD_C

diff --git a/newlib/libc/include/string.h b/newlib/libc/include/string.h
@@ -80,19 +80,11 @@ size_t	 strspn (const char *, const char *);
 char 	*strstr (const char *, const char *);
 
 
-#ifdef __STDC_WANT_LIB_EXT1__
-#if (__STDC_WANT_LIB_EXT1__ != 0) && (__STDC_WANT_LIB_EXT1__ != 1)
-#error Please define __STDC_WANT_LIB_EXT__ as 0 or 1
-#endif
-
 #if __STDC_WANT_LIB_EXT1__ == 1
-#include <stddef.h>
-#include <errno.h>
+#include <sys/_types.h>
 
-#ifndef __RSIZE_T
-#define __RSIZE_T
-typedef size_t rsize_t;
-#endif
+typedef __rsize_t rsize_t;
+typedef __errno_t errno_t;
 
 extern errno_t memcpy_s(void *__restrict, rsize_t, const void *__restrict, rsize_t);
 extern errno_t memset_s(void *, rsize_t, int, rsize_t);
@@ -105,7 +97,6 @@ extern size_t strnlen_s(const char *, size_t);
 extern errno_t strerror_s(char *, rsize_t, errno_t); /* C11 */
 extern size_t strerrorlen_s(errno_t);
 #endif
-#endif
 
 #ifndef _REENT_ONLY
 char 	*strtok (char *__restrict, const char *__restrict);

diff --git a/newlib/libc/include/sys/_types.h b/newlib/libc/include/sys/_types.h
@@ -265,4 +265,25 @@ typedef	unsigned short	__nlink_t;
 typedef	long		__suseconds_t;	/* microseconds (signed) */
 typedef	unsigned long	__useconds_t;	/* microseconds (unsigned) */
 
+
+#ifdef __STDC_WANT_LIB_EXT1__
+#if (__STDC_WANT_LIB_EXT1__ != 0) && (__STDC_WANT_LIB_EXT1__ != 1)
+#error Please define __STDC_WANT_LIB_EXT__ as 0 or 1
+#endif
+
+#if __STDC_WANT_LIB_EXT1__ == 1
+
+#ifndef __RSIZE_T
+#define __RSIZE_T
+typedef size_t __rsize_t;
+#endif
+
+#ifndef __ERRNO_T
+#define __ERRNO_T
+typedef int __errno_t;
+#endif
+
+#endif
+#endif
+
 #endif	/* _SYS__TYPES_H */
diff --git a/newlib/libc/include/sys/errno.h b/newlib/libc/include/sys/errno.h
@@ -227,8 +227,6 @@ extern NEWLIB_THREAD_LOCAL_ERRNO int errno;
 #endif
 #define EWOULDBLOCK EAGAIN	/* Operation would block */
 
-#define ELAST 149
-
 #define __ELASTERROR 2000       /* Users can add values starting here */
 
 #ifdef __cplusplus

diff --git a/newlib/libc/stdlib/CMakeLists.txt b/newlib/libc/stdlib/CMakeLists.txt
@@ -116,7 +116,6 @@ picolibc_sources(
   pico-onexit.c
   pico-cxa-atexit.c
   set_constraint_handler_s.c
-  rsizet.c
   )
 
 picolibc_sources_flags("-fno-builtin-malloc;-fno-builtin-free"

diff --git a/newlib/libc/stdlib/constraint.c b/newlib/libc/stdlib/constraint.c
diff --git a/newlib/libc/stdlib/meson.build b/newlib/libc/stdlib/meson.build
@@ -162,7 +162,6 @@ srcs_stdlib = [
     'wctomb.c',
     'wctomb_r.c',
     'set_constraint_handler_s.c',
-    'rsizet.c',
 ]
 
 srcs_stdlib_stdio = [

diff --git a/newlib/libc/stdlib/rsizet.c b/newlib/libc/stdlib/rsizet.c
diff --git a/newlib/libc/stdlib/set_constraint_handler_s.c b/newlib/libc/stdlib/set_constraint_handler_s.c
@@ -35,24 +35,27 @@
 #define __STDC_WANT_LIB_EXT1__ 1
 #include <stdlib.h>
 
-void ignore_handler_s(const char *restrict msg, void *restrict ptr, errno_t error)
+constraint_handler_t __cur_handler = abort_handler_s;
+
+void abort_handler_s(const char *restrict msg, void *restrict ptr, errno_t error)
 {
     (void) msg;
     (void) ptr;
     (void) error;
+    abort();
 }
 
 constraint_handler_t set_constraint_handler_s(constraint_handler_t handler)
 {
-    constraint_handler_t h = cur_handler;
+    constraint_handler_t h = __cur_handler;
 
     if (handler == (constraint_handler_t)NULL)
     {
-        cur_handler = ignore_handler_s; // null restores to default handler
+        __cur_handler = abort_handler_s; // null restores to default handler
     }
     else
     {
-        cur_handler = handler;
+        __cur_handler = handler;
     }
 
     return h;