Merge pull request zephyrproject-rtos#19 from endresshauser-lp/backport/pr-87784

Backport support for picolibc 1.8.10

Author: tpambor

include/zephyr/posix/posix_features.h

@@ -245,6 +245,13 @@
 /* #define _XOPEN_UNIX (-1L) */
 /* #define _XOPEN_UUCP (-1L) */
 
+#if _POSIX_C_SOURCE >= 200809L && (__PICOLIBC__ > 1 ||			\
+(__PICOLIBC__ == 1 && (__PICOLIBC_MINOR__ > 8 ||			\
+__PICOLIBC_MINOR__ == 8 && __PICOLIBC_PATCHLEVEL__ >= 9)))
+/* Use picolibc's limits.h when building POSIX code */
+#include <limits.h>
+#else
+
 /* Maximum values */
 #define _POSIX_CLOCKRES_MIN (20000000L)
 
@@ -307,6 +314,8 @@
 #define _XOPEN_NAME_MAX                     (255)
 #define _XOPEN_PATH_MAX                     (1024)
 
+#endif /* __PICOLIBC__ */
+
 /* Other invariant values */
 #define NL_LANGMAX (14)
 #define NL_MSGMAX  (32767)

lib/libc/picolibc/locks.c

@@ -7,8 +7,18 @@
 #include "picolibc-hooks.h"
 
 #ifdef CONFIG_MULTITHREADING
-#define _LOCK_T void *
-K_MUTEX_DEFINE(__lock___libc_recursive_mutex);
+
+#include <sys/lock.h>
+
+/* Define the picolibc lock type */
+struct __lock {
+	struct k_mutex m;
+};
+
+STRUCT_SECTION_ITERABLE_ALTERNATE(k_mutex, __lock,
+				  __lock___libc_recursive_mutex) = {
+	.m = Z_MUTEX_INITIALIZER(__lock___libc_recursive_mutex.m),
+};
 
 #ifdef CONFIG_USERSPACE
 /* Grant public access to picolibc lock after boot */
@@ -32,13 +42,13 @@ void __retarget_lock_init_recursive(_LOCK_T *lock)
 
 	/* Allocate mutex object */
 #ifndef CONFIG_USERSPACE
-	*lock = malloc(sizeof(struct k_mutex));
+	*lock = malloc(sizeof(struct __lock));
 #else
 	*lock = k_object_alloc(K_OBJ_MUTEX);
 #endif /* !CONFIG_USERSPACE */
 	__ASSERT(*lock != NULL, "recursive lock allocation failed");
 
-	k_mutex_init((struct k_mutex *)*lock);
+	k_mutex_init(&(*lock)->m);
 }
 
 /* Create a new dynamic non-recursive lock */
@@ -68,7 +78,7 @@ void __retarget_lock_close(_LOCK_T lock)
 void __retarget_lock_acquire_recursive(_LOCK_T lock)
 {
 	__ASSERT_NO_MSG(lock != NULL);
-	k_mutex_lock((struct k_mutex *)lock, K_FOREVER);
+	k_mutex_lock(&lock->m, K_FOREVER);
 }
 
 /* Acquiure non-recursive lock */
@@ -81,7 +91,7 @@ void __retarget_lock_acquire(_LOCK_T lock)
 int __retarget_lock_try_acquire_recursive(_LOCK_T lock)
 {
 	__ASSERT_NO_MSG(lock != NULL);
-	return !k_mutex_lock((struct k_mutex *)lock, K_NO_WAIT);
+	return !k_mutex_lock(&lock->m, K_NO_WAIT);
 }
 
 /* Try acquiring non-recursive lock */
@@ -94,7 +104,7 @@ int __retarget_lock_try_acquire(_LOCK_T lock)
 void __retarget_lock_release_recursive(_LOCK_T lock)
 {
 	__ASSERT_NO_MSG(lock != NULL);
-	k_mutex_unlock((struct k_mutex *)lock);
+	k_mutex_unlock(&lock->m);
 }
 
 /* Release non-recursive lock */

tests/kernel/common/src/printk.c

@@ -65,7 +65,7 @@ char expected_32[] = "22 113 10000 32768 40000 22\n"
 	"42 42 42 42\n"
 	"42 42 42 42\n"
 	"25542abcdef  42\n"
-#if defined(_WANT_MINIMAL_IO_LONG_LONG)
+#if defined(_WANT_MINIMAL_IO_LONG_LONG) || defined(__IO_MINIMAL_LONG_LONG)
 	"68719476735 -1 18446744073709551615 ffffffffffffffff\n"
 #else
 	"-1 -1 4294967295 ffffffff\n"

west.yml

@@ -336,7 +336,7 @@ manifest:
         - debug
     - name: picolibc
       path: modules/lib/picolibc
-      revision: 82d62ed1ac55b4e34a12d0390aced2dc9af13fc9
+      revision: 560946f26db075c296beea5b39d99e6de43c9010
     - name: segger
       revision: cf56b1d9c80f81a26e2ac5727c9cf177116a4692
       path: modules/debug/segger