From a95a722180291821673e72e3a94e0f9529727a4f Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh@glandium.org>
Date: Wed, 17 Jan 2024 11:15:14 +0900
Subject: [PATCH 1/2] Explicitly set LIBCXXABI_USE_LLVM_UNWINDER off

Clang trunk has recently turned it on, and also now fails the build when
libunwind is not built at the same time.
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 6afaa734f..88ba8df00 100644
--- a/Makefile
+++ b/Makefile
@@ -197,6 +197,7 @@ LIBCXX_CMAKE_FLAGS = \
     -DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF \
     -DLIBCXXABI_HAS_WIN32_THREAD_API:BOOL=OFF \
     -DLIBCXXABI_ENABLE_PIC:BOOL=$(2) \
+    -DLIBCXXABI_USE_LLVM_UNWINDER:BOOL=OFF \
     -DWASI_SDK_PREFIX=$(BUILD_PREFIX) \
     -DUNIX:BOOL=ON \
     --debug-trycompile

From a6ebb107e2f76fb7e4d4b868676cd709230b7bc9 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Fri, 8 Mar 2024 12:24:59 -0800
Subject: [PATCH 2/2] Bump LLVM to 18.1.0

---
 Makefile         | 1 -
 src/llvm-project | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index d03c091f3..b30a62a3b 100644
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,6 @@ build/llvm.BUILT:
 		-DLLVM_ENABLE_ZLIB=OFF \
 		-DLLVM_ENABLE_ZSTD=OFF \
 		-DLLVM_STATIC_LINK_CXX_STDLIB=ON \
-		-DLLVM_HAVE_LIBXAR=OFF \
 		-DCMAKE_INSTALL_PREFIX=$(PREFIX) \
 		-DLLVM_INCLUDE_TESTS=OFF \
 		-DLLVM_INCLUDE_UTILS=OFF \
diff --git a/src/llvm-project b/src/llvm-project
index 6009708b4..461274b81 160000
--- a/src/llvm-project
+++ b/src/llvm-project
@@ -1 +1 @@
-Subproject commit 6009708b4367171ccdbf4b5905cb6a803753fe18
+Subproject commit 461274b81d8641eab64d494accddc81d7db8a09e