[libcxx-commits] [libcxx] [libcxx] Update picolibc version used in CI to 1.8.10 (PR #165269)

[Victor Campos via libcxx-commits]

https://github.com/vhscampos created https://github.com/llvm/llvm-project/pull/165269

With this change, two xfails have been removed.

It also introduces a header inclusion for test macros that was wrongly missed.

>From 9d5eb1a381cd8127a10bb21b3c3d384d8e9ded1c Mon Sep 17 00:00:00 2001
From: Victor Campos <victor.campos at arm.com>
Date: Mon, 27 Oct 2025 09:34:44 +0000
Subject: [PATCH] [libcxx] Update picolibc version used in CI to 1.8.10

With this change, two xfails have been removed.

It also introduces a header inclusion for test macros that was wrongly
missed.
---
 libcxx/test/std/depr/depr.c.headers/uchar_h.compile.pass.cpp  | 3 ---
 .../std/depr/depr.c.headers/uchar_h_char8_t.compile.pass.cpp  | 3 ++-
 libcxx/test/std/strings/c.strings/cuchar.compile.pass.cpp     | 3 ---
 .../std/strings/c.strings/cuchar_char8_t.compile.pass.cpp     | 3 ++-
 libcxx/utils/ci/build-picolibc.sh                             | 4 ++--
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/libcxx/test/std/depr/depr.c.headers/uchar_h.compile.pass.cpp b/libcxx/test/std/depr/depr.c.headers/uchar_h.compile.pass.cpp
index c448ba83f4b38..96957a93a6df6 100644
--- a/libcxx/test/std/depr/depr.c.headers/uchar_h.compile.pass.cpp
+++ b/libcxx/test/std/depr/depr.c.headers/uchar_h.compile.pass.cpp
@@ -11,9 +11,6 @@
 // Apple platforms don't provide <uchar.h> yet, so these tests fail.
 // XFAIL: target={{.+}}-apple-{{.+}}
 
-// mbrtoc16 not defined.
-// XFAIL: LIBCXX-PICOLIBC-FIXME
-
 // <uchar.h>
 
 #include <uchar.h>
diff --git a/libcxx/test/std/depr/depr.c.headers/uchar_h_char8_t.compile.pass.cpp b/libcxx/test/std/depr/depr.c.headers/uchar_h_char8_t.compile.pass.cpp
index 34b512f9c5959..3a7474a7653ab 100644
--- a/libcxx/test/std/depr/depr.c.headers/uchar_h_char8_t.compile.pass.cpp
+++ b/libcxx/test/std/depr/depr.c.headers/uchar_h_char8_t.compile.pass.cpp
@@ -15,11 +15,12 @@
 // XFAIL: freebsd
 // XFAIL: windows
 // XFAIL: glibc-no-char8_t-support
-// XFAIL: LIBCXX-PICOLIBC-FIXME
 
 // <uchar.h>
 
 #include <uchar.h>
 
+#include "test_macros.h"
+
 ASSERT_SAME_TYPE(size_t, decltype(mbrtoc8((char8_t*)0, (const char*)0, (size_t)0, (mbstate_t*)0)));
 ASSERT_SAME_TYPE(size_t, decltype(c8rtomb((char*)0, (char8_t)0, (mbstate_t*)0)));
diff --git a/libcxx/test/std/strings/c.strings/cuchar.compile.pass.cpp b/libcxx/test/std/strings/c.strings/cuchar.compile.pass.cpp
index 96b394a9934f8..22ee58a94f9d4 100644
--- a/libcxx/test/std/strings/c.strings/cuchar.compile.pass.cpp
+++ b/libcxx/test/std/strings/c.strings/cuchar.compile.pass.cpp
@@ -11,9 +11,6 @@
 // Apple platforms don't provide <uchar.h> yet, so these tests fail.
 // XFAIL: target={{.+}}-apple-{{.+}}
 
-// mbrtoc16 not defined.
-// XFAIL: LIBCXX-PICOLIBC-FIXME
-
 // <cuchar>
 
 #include <cuchar>
diff --git a/libcxx/test/std/strings/c.strings/cuchar_char8_t.compile.pass.cpp b/libcxx/test/std/strings/c.strings/cuchar_char8_t.compile.pass.cpp
index 019265b534c5c..0b5433d842fb8 100644
--- a/libcxx/test/std/strings/c.strings/cuchar_char8_t.compile.pass.cpp
+++ b/libcxx/test/std/strings/c.strings/cuchar_char8_t.compile.pass.cpp
@@ -15,11 +15,12 @@
 // XFAIL: freebsd
 // XFAIL: windows
 // XFAIL: glibc-no-char8_t-support
-// XFAIL: LIBCXX-PICOLIBC-FIXME
 
 // <cuchar>
 
 #include <cuchar>
 
+#include "test_macros.h"
+
 ASSERT_SAME_TYPE(std::size_t, decltype(std::mbrtoc8((char8_t*)0, (const char*)0, (size_t)0, (mbstate_t*)0)));
 ASSERT_SAME_TYPE(std::size_t, decltype(std::c8rtomb((char*)0, (char8_t)0, (mbstate_t*)0)));
diff --git a/libcxx/utils/ci/build-picolibc.sh b/libcxx/utils/ci/build-picolibc.sh
index a25a588cb8d2e..516aa55a1c2c5 100755
--- a/libcxx/utils/ci/build-picolibc.sh
+++ b/libcxx/utils/ci/build-picolibc.sh
@@ -69,8 +69,8 @@ picolibc_source_dir="${build_dir}/picolibc-source"
 picolibc_build_dir="${build_dir}/picolibc-build"
 mkdir -p "${picolibc_source_dir}"
 mkdir -p "${picolibc_build_dir}"
-# Download a known good version of picolibc.
-picolibc_commit="48fbc2009c6473293d03d5ec6f190565c6223a5c"
+# Download a known good version of picolibc: v1.8.10
+picolibc_commit="51a8b32857e75345c37652a80b5cda98b28d69e5"
 curl -L "https://github.com/picolibc/picolibc/archive/${picolibc_commit}.zip" --output "${picolibc_source_dir}/picolibc.zip"
 unzip -q "${picolibc_source_dir}/picolibc.zip" -d "${picolibc_source_dir}"
 mv "${picolibc_source_dir}/picolibc-${picolibc_commit}"/* "${picolibc_source_dir}"