aboutsummaryrefslogtreecommitdiff
path: root/libunwind
diff options
context:
space:
mode:
authorNico Weber <thakis@chromium.org>2023-05-17 10:46:45 -0400
committerNico Weber <thakis@chromium.org>2023-05-17 10:53:33 -0400
commitd763c6e5e2d0a6b34097aa7dabca31e9aff9b0b6 (patch)
treeefbb52b2ca03bfac87b6e9a3ebb106d8428270cb /libunwind
parentd9610b4a56c532614545eef5995362e99b776535 (diff)
downloadllvm-d763c6e5e2d0a6b34097aa7dabca31e9aff9b0b6.zip
llvm-d763c6e5e2d0a6b34097aa7dabca31e9aff9b0b6.tar.gz
llvm-d763c6e5e2d0a6b34097aa7dabca31e9aff9b0b6.tar.bz2
Revert "Reland "[CMake] Bumps minimum version to 3.20.0.""
This reverts commit 65429b9af6a2c99d340ab2dcddd41dab201f399c. Broke several projects, see https://reviews.llvm.org/D144509#4347562 onwards. Also reverts follow-up commit "[OpenMP] Compile assembly files as ASM, not C" This reverts commit 4072c8aee4c89c4457f4f30d01dc9bb4dfa52559. Also reverts fix attempt "[cmake] Set CMP0091 to fix Windows builds after the cmake_minimum_required bump" This reverts commit 7d47dac5f828efd1d378ba44a97559114f00fb64.
Diffstat (limited to 'libunwind')
-rw-r--r--libunwind/CMakeLists.txt2
-rw-r--r--libunwind/src/CMakeLists.txt3
2 files changed, 3 insertions, 2 deletions
diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt
index bd49dfb..6f12a16 100644
--- a/libunwind/CMakeLists.txt
+++ b/libunwind/CMakeLists.txt
@@ -2,7 +2,7 @@
# Setup Project
#===============================================================================
-cmake_minimum_required(VERSION 3.20.0)
+cmake_minimum_required(VERSION 3.13.4)
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
diff --git a/libunwind/src/CMakeLists.txt b/libunwind/src/CMakeLists.txt
index ef34174..2eabbe0 100644
--- a/libunwind/src/CMakeLists.txt
+++ b/libunwind/src/CMakeLists.txt
@@ -30,7 +30,8 @@ set(LIBUNWIND_ASM_SOURCES
# CMake doesn't work correctly with assembly on AIX. Workaround by compiling
# as C files as well.
if((APPLE AND CMAKE_VERSION VERSION_LESS 3.19) OR
- (MINGW AND CMAKE_VERSION VERSION_LESS 3.17))
+ (MINGW AND CMAKE_VERSION VERSION_LESS 3.17) OR
+ (${CMAKE_SYSTEM_NAME} MATCHES "AIX"))
set_source_files_properties(${LIBUNWIND_ASM_SOURCES} PROPERTIES LANGUAGE C)
endif()