From 2d7853c64b0b118d71764b132df1593c2c7545bf Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Fri, 8 Mar 2024 17:36:40 -0600
Subject: [PATCH] Bump to LLVM 18.1.0 (#393)

* 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.

* Bump LLVM to 18.1.0

---------

Co-authored-by: Mike Hommey <mh@glandium.org>
---
 Makefile         | 2 +-
 src/llvm-project | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index c17094d..b30a62a 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 \
@@ -212,6 +211,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 \
diff --git a/src/llvm-project b/src/llvm-project
index 6009708..461274b 160000
--- a/src/llvm-project
+++ b/src/llvm-project
@@ -1 +1 @@
-Subproject commit 6009708b4367171ccdbf4b5905cb6a803753fe18
+Subproject commit 461274b81d8641eab64d494accddc81d7db8a09e