[Weekly]: Merge from branch main of upstream

Author: Laur59

CMakeLists.txt

@@ -284,7 +284,7 @@ endif()
 # The patches are generated from custom branch, with followin command:
 #   git format-patch -k origin/main
 # The patches apply cleanly against llvm-project commit
-# ed551e0778a35f00ab60f1c80d83ea8274d8d400.
+# 327124ece7d59de56ca0f9faa2cd82af68c011b9.
 set(
     llvm_project_patches
     ${CMAKE_CURRENT_SOURCE_DIR}/patches/llvm-project/0001-libc-tests-with-picolibc-xfail-one-remaining-test.patch
@@ -333,18 +333,24 @@ if(NOT (LLVM_TOOLCHAIN_C_LIBRARY STREQUAL llvmlibc)) # libc in a separate repo?
   FetchContent_MakeAvailable(${LLVM_TOOLCHAIN_C_LIBRARY})
 endif()
 
+##################################################################################################
+# We set all project properties later, this call is just to enable the
+# CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT check
+project(LLVMEmbeddedToolchainForArm)
 # We generally want to install to a local directory to see what the
 # output will look like rather than install into the system, so change
 # the default accordingly.
 # See https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT.html
-# Note that this code only works after the first call to project so it
-# can't be moved after the add_subdirectory command below.
+# Note that THIS CODE ONLY WORKS AFTER THE FIRST CALL TO PROJECT so it
+# can't be moved after the add_subdirectory(<llvm>) command below as it will be too late -
+# the llvm project will set it to the default system install directory.
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     set(CMAKE_INSTALL_PREFIX
         "${CMAKE_BINARY_DIR}/install"
         CACHE PATH "" FORCE
     )
 endif()
+##################################################################################################
 
 # Whether to try to build C++ libraries. (We can't currently do this
 # for all choices of C library.)
@@ -1245,6 +1251,7 @@ function(
         -DLIBCXXABI_USE_COMPILER_RT=ON
         -DLIBCXXABI_USE_LLVM_UNWINDER=ON
         -DLIBCXXABI_TEST_PARAMS=executor=${test_executor}
+        -DLIBCXXABI_SHARED_OUTPUT_NAME="c++abi-shared"
         -DLIBCXX_ABI_UNSTABLE=ON
         -DLIBCXX_CXX_ABI=libcxxabi
         -DLIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY=ON
@@ -1253,12 +1260,14 @@ function(
         -DLIBCXX_ENABLE_STATIC=ON
         -DLIBCXX_INCLUDE_BENCHMARKS=OFF
         -DLIBCXX_TEST_PARAMS=executor=${test_executor}
+        -DLIBCXX_SHARED_OUTPUT_NAME="c++-shared"
         -DLIBUNWIND_ENABLE_SHARED=OFF
         -DLIBUNWIND_ENABLE_STATIC=ON
         -DLIBUNWIND_IS_BAREMETAL=ON
         -DLIBUNWIND_REMEMBER_HEAP_ALLOC=ON
         -DLIBUNWIND_USE_COMPILER_RT=ON
         -DLIBUNWIND_TEST_PARAMS=executor=${test_executor}
+        -DLIBUNWIND_SHARED_OUTPUT_NAME="unwind-shared"
         -DLLVM_LIT_ARGS=${LLVM_LIT_ARGS}
         -DLLVM_ENABLE_RUNTIMES=libcxxabi,libcxx,libunwind
         -DRUNTIME_TEST_ARCH_FLAGS=${flags}
@@ -1520,7 +1529,7 @@ function(add_nonexistent_library_variant)
     )
     cmake_parse_arguments(ERR "" "${one_value_args}" "" ${ARGN})
 
-    string(APPEND multilib_yaml_content "- FatalError: \"${ERR_ERROR_MESSAGE}\"\n")
+    string(APPEND multilib_yaml_content "- Error: \"${ERR_ERROR_MESSAGE}\"\n")
 
     string(APPEND multilib_yaml_content "  Flags:\n")
     string(REPLACE " " ";" multilib_flags_list ${ERR_MULTILIB_FLAGS})

docs/Screenshot_L4R5.png

@@ -1,4 +1,4 @@
-From fd26b5fd6a882677062a7c495660f22ca2b13cd5 Mon Sep 17 00:00:00 2001
+From 623881f1ea465f9c1837981db143f7225108580a 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: [libc++] tests with picolibc: xfail one remaining test

docs/Screenshot_U5A9.png

@@ -1,4 +1,4 @@
-From 02175d0f237e5d14c6b59ce6b16818927f10368f Mon Sep 17 00:00:00 2001
+From 8a0f8650d58f27ca32948554188b98c8978d1eb6 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
@@ -41,7 +41,7 @@ index b5f9089308d2..0a83e75ceceb 100644
  set(LIBUNWIND_USE_COMPILER_RT ON CACHE BOOL "")
  find_program(QEMU_SYSTEM_ARM qemu-system-arm REQUIRED)
 diff --git a/libcxxabi/test/test_demangle.pass.cpp b/libcxxabi/test/test_demangle.pass.cpp
-index 77f79e0d40e8..4b69df08ea28 100644
+index ad131bb3a8a7..ac612c79f71c 100644
 --- a/libcxxabi/test/test_demangle.pass.cpp
 +++ b/libcxxabi/test/test_demangle.pass.cpp
 @@ -7,7 +7,7 @@
@@ -51,8 +51,8 @@ index 77f79e0d40e8..4b69df08ea28 100644
 -// 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.
+ // This test exercises support for char array initializer lists added in dd8b266ef.
+ // UNSUPPORTED: using-built-library-before-llvm-20
 -- 
 2.39.5 (Apple Git-154)
 

patches/llvm-project/0001-libc-tests-with-picolibc-xfail-one-remaining-test.patch

@@ -1,4 +1,4 @@
-From d1d619643bedea5759ef56ed42c4d97846f3c789 Mon Sep 17 00:00:00 2001
+From 0f8dc80a7642430c8d02c36283766aeb5a59a331 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/0002-libc-tests-with-picolibc-disable-large-tests.patch

@@ -1,4 +1,4 @@
-From 46019866b66f8859e7dff666c519c35d5b921291 Mon Sep 17 00:00:00 2001
+From f5b5a95bd02f6d5bc6e80c238c2e8f7e08985d80 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
@@ -88,7 +88,7 @@ index 000000000000..5ecc58f3e385
 +if "has-no-atomics" in config.available_features:
 +    config.unsupported = True
 diff --git a/libcxx/utils/libcxx/test/features.py b/libcxx/utils/libcxx/test/features.py
-index 15456171b548..ddd44a63c618 100644
+index 735eb5ac949d..6ca4e8acb3f4 100644
 --- a/libcxx/utils/libcxx/test/features.py
 +++ b/libcxx/utils/libcxx/test/features.py
 @@ -215,6 +215,21 @@ DEFAULT_FEATURES = [

patches/llvm-project/0003-Disable-failing-compiler-rt-test.patch

@@ -1,4 +1,4 @@
-From e3d01a7a6d51fe1f2d605a49123e72e2f493a532 Mon Sep 17 00:00:00 2001
+From 0961af52ac015c26829b4dae7fd6879a0b633f44 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/0004-libc-tests-with-picolibc-XFAIL-uses-of-atomics.patch

@@ -9,11 +9,11 @@
     "llvm-project": {
       "comment": "tagType can be branch, tag or commithash",
       "tagType": "commithash",
-      "tag": "1e75d086"
+      "tag": "48deb356"
     },
     "picolibc": {
       "tagType": "commithash",
-      "tag": "21d8fed7"
+      "tag": "d492d5fa"
     },
     "newlib": {
       "tagType": "tag",