1- From 05ba37d8fe0119759eb0d1c72fe82e3641037bc4 Mon Sep 17 00:00:00 2001
1+ From fb9f8352904429054104cd7670034858e06b84a7 Mon Sep 17 00:00:00 2001
22From: Michael Platings <
[email protected] >
33Date: Fri, 29 Sep 2023 09:35:52 +0100
44Subject: [PATCH 2/4] Add check for building with picolibc
@@ -55,9 +55,8 @@ Differential Revision: https://reviews.llvm.org/D154246
5555 libcxx/utils/ci/run-buildbot | 35 ++++++
5656 libcxx/utils/libcxx/test/features.py | 27 ++++-
5757 .../test/configs/armv7m-libc++abi.cfg.in | 39 +++++++
58- libcxxabi/test/test_demangle.pass.cpp | 3 +
5958 .../test/configs/armv7m-libunwind.cfg.in | 32 +++++
60- 47 files changed, 437 insertions(+), 13 deletions(-)
59+ 46 files changed, 434 insertions(+), 13 deletions(-)
6160 create mode 100644 libcxx/cmake/caches/Armv7M-picolibc.cmake
6261 create mode 100644 libcxx/test/configs/armv7m-libc++.cfg.in
6362 create mode 100755 libcxx/utils/ci/build-picolibc.sh
@@ -801,10 +800,10 @@ index 000000000000..acdcabe96e96
801800+
802801+ "${venv_dir}/bin/meson" install -C "${picolibc_build_dir}"
803802diff --git a/libcxx/utils/ci/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml
804- index 5a5bc39c5797..674167e2e0f7 100644
803+ index 41b3d27d48f7..bf244206a02b 100644
805804--- a/libcxx/utils/ci/buildkite-pipeline.yml
806805+++ b/libcxx/utils/ci/buildkite-pipeline.yml
807- @@ -1038 ,6 +1038 ,20 @@ steps:
806+ @@ -1056 ,6 +1056 ,20 @@ steps:
808807 limit: 2
809808 timeout_in_minutes: 120
810809
@@ -826,10 +825,10 @@ index 5a5bc39c5797..674167e2e0f7 100644
826825 steps:
827826 - label: "AIX (32-bit)"
828827diff --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot
829- index ebb255243ba9..8d08435e8971 100755
828+ index c4834330d7e3..1bed14d3908a 100755
830829--- a/libcxx/utils/ci/run-buildbot
831830+++ b/libcxx/utils/ci/run-buildbot
832- @@ -621 ,6 +621 ,41 @@ armv7-no-exceptions)
831+ @@ -627 ,6 +627 ,41 @@ armv7-no-exceptions)
833832 generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv7Thumb-no-exceptions.cmake"
834833 check-runtimes
835834 ;;
@@ -872,7 +871,7 @@ index ebb255243ba9..8d08435e8971 100755
872871 clean
873872 # TODO: Currently, building with the experimental library breaks running
874873diff --git a/libcxx/utils/libcxx/test/features.py b/libcxx/utils/libcxx/test/features.py
875- index de7d3e140dd0..bf399bb5d8cb 100644
874+ index 29822f555213..d2f4859e367f 100644
876875--- a/libcxx/utils/libcxx/test/features.py
877876+++ b/libcxx/utils/libcxx/test/features.py
878877@@ -110,6 +110,17 @@ DEFAULT_FEATURES = [
@@ -893,7 +892,7 @@ index de7d3e140dd0..bf399bb5d8cb 100644
893892 Feature(
894893 name="non-lockfree-atomics",
895894 when=lambda cfg: sourceBuilds(
896- @@ -215 ,7 +226 ,8 @@ DEFAULT_FEATURES = [
895+ @@ -197 ,7 +208 ,8 @@ DEFAULT_FEATURES = [
897896 #include <unistd.h>
898897 #include <sys/wait.h>
899898 int main(int, char**) {
@@ -903,7 +902,7 @@ index de7d3e140dd0..bf399bb5d8cb 100644
903902 }
904903 """,
905904 ),
906- @@ -418 ,6 +430 ,19 @@ DEFAULT_FEATURES += [
905+ @@ -401 ,6 +413 ,19 @@ DEFAULT_FEATURES += [
907906 name="LIBCXX-FREEBSD-FIXME",
908907 when=lambda cfg: "__FreeBSD__" in compilerMacros(cfg),
909908 ),
@@ -968,20 +967,6 @@ index 000000000000..d022e84fb19e
968967+ config,
969968+ lit_config
970969+ )
971- diff --git a/libcxxabi/test/test_demangle.pass.cpp b/libcxxabi/test/test_demangle.pass.cpp
972- index 77741a952850..0bc7d0db3db2 100644
973- --- a/libcxxabi/test/test_demangle.pass.cpp
974- +++ b/libcxxabi/test/test_demangle.pass.cpp
975- @@ -9,6 +9,9 @@
976- // The demangler does not pass all these tests with the system dylibs on macOS.
977- // XFAIL: stdlib=apple-libc++ && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}}
978-
979- + // This test is too big for most embedded devices.
980- + // XFAIL: LIBCXX-PICOLIBC-FIXME
981- +
982- // https://llvm.org/PR51407 was not fixed in some previously-released
983- // demanglers, which causes them to run into the infinite loop.
984- // UNSUPPORTED: stdlib=apple-libc++ && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}}
985970diff --git a/libunwind/test/configs/armv7m-libunwind.cfg.in b/libunwind/test/configs/armv7m-libunwind.cfg.in
986971new file mode 100644
987972index 000000000000..5f15ccd3613c
0 commit comments