Update patches after libc++ tests entered upstream

CMakeLists.txt

@@ -259,19 +259,17 @@ read_repo_version(${LLVM_TOOLCHAIN_C_LIBRARY} ${LLVM_TOOLCHAIN_C_LIBRARY})
 set(
     llvm_project_patches
     ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0001-Add-ExclusiveGroup-feature-to-multilib.yaml.patch
-    ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0002-Add-check-for-building-with-picolibc.patch
-    ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0003-Run-picolibc-tests-with-qemu.patch
-    ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0004-xfail-two-remaining-libcxx-with-picolibc-tests.patch
-    ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0005-disable-large-tests.patch
-    ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0006-Disable-failing-compiler-rt-test.patch
-    ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0007-libc-tests-with-picolibc-handle-stdin.patch
-    ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0008-libc-tests-with-picolibc-add-has-compolete-fenv-feat.patch
-    ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0009-libc-tests-with-picolibc-Fix-expected-error-message.patch
-    ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0010-libc-tests-with-picolibc-Fix-iterator-diff_type-to-s.patch
-    ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0011-libc-tests-with-picolibc-mark-sort-test-as-long-one.patch
-    ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0012-libc-tests-with-picolibc-XFAIL-uses-of-atomics.patch
-    ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0013-libc-tests-with-picolibc-mark-two-more-large-tests.patch
-    ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0014-libc-tests-with-picolibc-xfail-test-missing-rt-libra.patch
+    ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0002-xfail-two-remaining-libcxx-with-picolibc-tests.patch
+    ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0003-libc-tests-with-picolibc-disable-large-tests.patch
+    ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0004-Disable-failing-compiler-rt-test.patch
+    ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0005-libc-tests-with-picolibc-handle-stdin.patch
+    ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0006-libc-tests-with-picolibc-add-has-compolete-fenv-feat.patch
+    ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0007-libc-tests-with-picolibc-Fix-expected-error-message.patch
+    ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0008-libc-tests-with-picolibc-Fix-iterator-diff_type-to-s.patch
+    ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0009-libc-tests-with-picolibc-mark-sort-test-as-long-one.patch
+    ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0010-libc-tests-with-picolibc-XFAIL-uses-of-atomics.patch
+    ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0011-libc-tests-with-picolibc-mark-two-more-large-tests.patch
+    ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0012-libc-tests-with-picolibc-xfail-test-missing-rt-libra.patch
 )
 FetchContent_Declare(llvmproject
     GIT_REPOSITORY https://github.com/llvm/llvm-project.git

patches/llvm-project/0001-Add-ExclusiveGroup-feature-to-multilib.yaml.patch

@@ -1,4 +1,4 @@
-From 4710a6c7f72252b503d1269b774f08ab93ce7622 Mon Sep 17 00:00:00 2001
+From c401df2e493a01d4785e3135d9bbd842ce9ceb89 Mon Sep 17 00:00:00 2001
 From: Simi Pallipurath <[email protected]>
 Date: Tue, 21 Nov 2023 16:20:43 +0000
 Subject: Add ExclusiveGroup feature to multilib.yaml.

patches/llvm-project/0004-xfail-two-remaining-libcxx-with-picolibc-tests.patch → patches/llvm-project/0002-xfail-two-remaining-libcxx-with-picolibc-tests.patch

@@ -1,4 +1,4 @@
-From cef87370a380d5fb62345e555a6df6cf6bb7de80 Mon Sep 17 00:00:00 2001
+From 8262b29ffcd9083f5c648131c69f672023859f7d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dominik=20W=C3=B3jt?= <[email protected]>
 Date: Mon, 16 Oct 2023 11:35:48 +0200
 Subject: xfail two remaining libcxx with picolibc tests

patches/llvm-project/0003-libc-tests-with-picolibc-disable-large-tests.patch

@@ -0,0 +1,58 @@
+From 555fbcabc83763423e547d9e18a7289078cb47bc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dominik=20W=C3=B3jt?= <[email protected]>
+Date: Wed, 15 Nov 2023 12:18:35 +0100
+Subject: [libc++] tests with picolibc: disable large tests
+
+---
+ libcxx/cmake/caches/Armv7M-picolibc.cmake | 9 ++++++++-
+ libcxxabi/test/test_demangle.pass.cpp     | 2 +-
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/libcxx/cmake/caches/Armv7M-picolibc.cmake b/libcxx/cmake/caches/Armv7M-picolibc.cmake
+index 9f8863943444..3ac426ad7948 100644
+--- a/libcxx/cmake/caches/Armv7M-picolibc.cmake
++++ b/libcxx/cmake/caches/Armv7M-picolibc.cmake
+@@ -17,6 +17,9 @@ set(LIBCXXABI_ENABLE_EXCEPTIONS OFF CACHE BOOL "")
+ set(LIBCXXABI_ENABLE_SHARED OFF CACHE BOOL "")
+ set(LIBCXXABI_ENABLE_STATIC ON CACHE BOOL "")
+ set(LIBCXXABI_ENABLE_THREADS OFF CACHE BOOL "")
++# Long tests are prohibitively slow when run via emulation.
++# The emulated target has limited memory.
++set(LIBCXXABI_TEST_PARAMS "long_tests=False large_tests=False" CACHE STRING "")
+ set(LIBCXXABI_USE_COMPILER_RT ON CACHE BOOL "")
+ set(LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "")
+ set(LIBCXX_ENABLE_EXCEPTIONS OFF CACHE BOOL "")
+@@ -30,12 +33,16 @@ set(LIBCXX_ENABLE_THREADS OFF CACHE BOOL "")
+ set(LIBCXX_ENABLE_WIDE_CHARACTERS OFF CACHE BOOL "")
+ set(LIBCXX_INCLUDE_BENCHMARKS OFF CACHE BOOL "")
+ # Long tests are prohibitively slow when run via emulation.
+-set(LIBCXX_TEST_PARAMS "long_tests=False" CACHE STRING "")
++# The emulated target has limited memory.
++set(LIBCXX_TEST_PARAMS "long_tests=False large_tests=False" CACHE STRING "")
+ set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")
+ set(LIBUNWIND_ENABLE_SHARED OFF CACHE BOOL "")
+ set(LIBUNWIND_ENABLE_STATIC ON CACHE BOOL "")
+ set(LIBUNWIND_ENABLE_THREADS OFF CACHE BOOL "")
+ set(LIBUNWIND_IS_BAREMETAL ON CACHE BOOL "")
+ set(LIBUNWIND_REMEMBER_HEAP_ALLOC ON CACHE BOOL "")
++# Long tests are prohibitively slow when run via emulation.
++# The emulated target has limited memory.
++set(LIBUNWIND_TEST_PARAMS "long_tests=False large_tests=False" CACHE STRING "")
+ set(LIBUNWIND_USE_COMPILER_RT ON CACHE BOOL "")
+ find_program(QEMU_SYSTEM_ARM qemu-system-arm)
+diff --git a/libcxxabi/test/test_demangle.pass.cpp b/libcxxabi/test/test_demangle.pass.cpp
+index b7e41099ebfc..8f04caba6ad9 100644
+--- a/libcxxabi/test/test_demangle.pass.cpp
++++ b/libcxxabi/test/test_demangle.pass.cpp
+@@ -10,7 +10,7 @@
+ // XFAIL: stdlib=apple-libc++ && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}}
+
+ // This test is too big for most embedded devices.
+-// XFAIL: LIBCXX-PICOLIBC-FIXME
++// REQUIRES: large_tests
+
+ // https://llvm.org/PR51407 was not fixed in some previously-released
+ // demanglers, which causes them to run into the infinite loop.
+-- 
+2.34.1
+

patches/llvm-project/0006-Disable-failing-compiler-rt-test.patch → patches/llvm-project/0004-Disable-failing-compiler-rt-test.patch

@@ -1,4 +1,4 @@
-From a75e049595315ab4827eb2ff36a8f62b95eae70c Mon Sep 17 00:00:00 2001
+From 83c5054ea596497ceca96b7605f0f2d2b69884e7 Mon Sep 17 00:00:00 2001
 From: Piotr Przybyla <[email protected]>
 Date: Wed, 15 Nov 2023 16:04:24 +0000
 Subject: Disable failing compiler-rt test

patches/llvm-project/0007-libc-tests-with-picolibc-handle-stdin.patch → patches/llvm-project/0005-libc-tests-with-picolibc-handle-stdin.patch

@@ -1,4 +1,4 @@
-From 26677138b697566f283715359171272842867ac9 Mon Sep 17 00:00:00 2001
+From 89830497518b26d39bbdaf8cb835ce9de3eab51c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dominik=20W=C3=B3jt?= <[email protected]>
 Date: Mon, 23 Oct 2023 14:37:41 +0200
 Subject: [libc++] tests with picolibc: handle stdin

patches/llvm-project/0008-libc-tests-with-picolibc-add-has-compolete-fenv-feat.patch → patches/llvm-project/0006-libc-tests-with-picolibc-add-has-compolete-fenv-feat.patch

@@ -1,4 +1,4 @@
-From d9a35d088a49c8ca946e8e273089c88fe6724fc9 Mon Sep 17 00:00:00 2001
+From 69b8c896e78334d601e46aa0f29be523f15e461c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dominik=20W=C3=B3jt?= <[email protected]>
 Date: Tue, 24 Oct 2023 12:12:27 +0200
 Subject: [libc++] tests with picolibc: add has-compolete-fenv feature

patches/llvm-project/0009-libc-tests-with-picolibc-Fix-expected-error-message.patch → patches/llvm-project/0007-libc-tests-with-picolibc-Fix-expected-error-message.patch

@@ -1,4 +1,4 @@
-From f8a81d827b1d63da46c794fa931285f6ebe9fc70 Mon Sep 17 00:00:00 2001
+From e1951f46391ed43dcae49afb592051bbcbb7397e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dominik=20W=C3=B3jt?= <[email protected]>
 Date: Wed, 25 Oct 2023 12:27:18 +0200
 Subject: [libc++] tests with picolibc: Fix expected error message

patches/llvm-project/0010-libc-tests-with-picolibc-Fix-iterator-diff_type-to-s.patch → patches/llvm-project/0008-libc-tests-with-picolibc-Fix-iterator-diff_type-to-s.patch

@@ -1,4 +1,4 @@
-From bc25322abaeabed5302e97e96b102d4f29fdb566 Mon Sep 17 00:00:00 2001
+From 00f5102bee1a415d31ee38f13b45f99cdf68217c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dominik=20W=C3=B3jt?= <[email protected]>
 Date: Fri, 27 Oct 2023 14:33:48 +0200
 Subject: [libc++] tests with picolibc: Fix iterator diff_type to

patches/llvm-project/0011-libc-tests-with-picolibc-mark-sort-test-as-long-one.patch → patches/llvm-project/0009-libc-tests-with-picolibc-mark-sort-test-as-long-one.patch

@@ -1,4 +1,4 @@
-From 3a96ac98b4330af2bd3bf3da546f10f74a1ab8b2 Mon Sep 17 00:00:00 2001
+From 72ce44d20936dc45a241e2ee728c5fae82769c4a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dominik=20W=C3=B3jt?= <[email protected]>
 Date: Thu, 9 Nov 2023 14:14:30 +0100
 Subject: [libc++] tests with picolibc: mark sort test as long one

patches/llvm-project/0012-libc-tests-with-picolibc-XFAIL-uses-of-atomics.patch → patches/llvm-project/0010-libc-tests-with-picolibc-XFAIL-uses-of-atomics.patch

@@ -1,4 +1,4 @@
-From 59042dbd4f0afad0453aeb7a8e96a09b94d2c7be Mon Sep 17 00:00:00 2001
+From e3f16bc9e7947bf4f16b9760f6b97fab7ce98ec2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dominik=20W=C3=B3jt?= <[email protected]>
 Date: Thu, 9 Nov 2023 15:25:14 +0100
 Subject: [libc++] tests with picolibc: XFAIL uses of atomics

patches/llvm-project/0013-libc-tests-with-picolibc-mark-two-more-large-tests.patch → patches/llvm-project/0011-libc-tests-with-picolibc-mark-two-more-large-tests.patch

@@ -1,4 +1,4 @@
-From 52333466de30e14c056f5fa57ce3a225411d3b8d Mon Sep 17 00:00:00 2001
+From 71204b845198165770fbf68c1285abdda65c43e0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dominik=20W=C3=B3jt?= <[email protected]>
 Date: Wed, 22 Nov 2023 16:12:39 +0100
 Subject: [libc++] tests with picolibc: mark two more large tests

patches/llvm-project/0014-libc-tests-with-picolibc-xfail-test-missing-rt-libra.patch → patches/llvm-project/0012-libc-tests-with-picolibc-xfail-test-missing-rt-libra.patch

@@ -1,4 +1,4 @@
-From 22a9ced293a5bc87619e9c28432c7d9137a2feb0 Mon Sep 17 00:00:00 2001
+From 890e0fffa3d0a29059d843876b65bcd2c679e43c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dominik=20W=C3=B3jt?= <[email protected]>
 Date: Fri, 24 Nov 2023 10:18:29 +0100
 Subject: [libc++] tests with picolibc: xfail test missing "rt" library