From 8c9303d46e18bb7d850d7343e14916c055a59471 Mon Sep 17 00:00:00 2001
From: Patrick Wildt <patrick@cvs.openbsd.org>
Date: Wed, 28 Apr 2021 12:59:02 +0000
Subject: Import libunwind 11.1.0 release.

---
 gnu/llvm/libunwind/.clang-format      |  2 ++
 gnu/llvm/libunwind/CMakeLists.txt     |  2 +-
 gnu/llvm/libunwind/src/CMakeLists.txt | 12 ++++--------
 3 files changed, 7 insertions(+), 9 deletions(-)
 create mode 100644 gnu/llvm/libunwind/.clang-format

(limited to 'gnu/llvm')

diff --git a/gnu/llvm/libunwind/.clang-format b/gnu/llvm/libunwind/.clang-format
new file mode 100644
index 00000000000..5bead5f39dd
--- /dev/null
+++ b/gnu/llvm/libunwind/.clang-format
@@ -0,0 +1,2 @@
+BasedOnStyle: LLVM
+
diff --git a/gnu/llvm/libunwind/CMakeLists.txt b/gnu/llvm/libunwind/CMakeLists.txt
index bd8176c6792..e44a103648f 100644
--- a/gnu/llvm/libunwind/CMakeLists.txt
+++ b/gnu/llvm/libunwind/CMakeLists.txt
@@ -83,7 +83,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBUNWIND_STANDALONE_B
   endif()
 
   set(PACKAGE_NAME libunwind)
-  set(PACKAGE_VERSION 11.0.0)
+  set(PACKAGE_VERSION 11.1.0)
   set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
   set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org")
 
diff --git a/gnu/llvm/libunwind/src/CMakeLists.txt b/gnu/llvm/libunwind/src/CMakeLists.txt
index 8f79b1cf874..309a85b22f5 100644
--- a/gnu/llvm/libunwind/src/CMakeLists.txt
+++ b/gnu/llvm/libunwind/src/CMakeLists.txt
@@ -24,14 +24,10 @@ set(LIBUNWIND_ASM_SOURCES
     UnwindRegistersRestore.S
     UnwindRegistersSave.S
     )
-if (MINGW OR APPLE)
-  # CMake doesn't build assembly sources for windows/gnu targets properly
-  # (up to current CMake, 3.16), so treat them as C files.
-  # Additionally, CMake ignores OSX_ARCHITECTURE for ASM files when targeting
-  # Apple platforms.
-  set_source_files_properties(${LIBUNWIND_ASM_SOURCES}
-                              PROPERTIES
-                                LANGUAGE C)
+
+# See add_asm_sources() in compiler-rt for explanation of this workaround.
+if((APPLE AND CMAKE_VERSION VERSION_LESS 3.19) OR (MINGW AND CMAKE_VERSION VERSION_LESS 3.17))
+  set_source_files_properties(${LIBUNWIND_ASM_SOURCES} PROPERTIES LANGUAGE C)
 endif()
 
 set(LIBUNWIND_HEADERS
-- 
cgit v1.2.3