From e83a546d29881bf5509ad564eca903474f8075b4 Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Fri, 5 Jun 2026 13:08:01 +0200 Subject: [PATCH 1/2] Fix libunwind detection on arm The inner "if" handles arm correctly, but the outer "if" is only entered on x64_64. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fe17a42fc..a1d780b51 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,7 @@ if(ENABLE_LIBUNWIND AND UNIX AND NOT ANDROID) find_library(LIBUNWIND_LIB unwind) if(LIBUNWIND_LIB) set(LIBUNWIND_LIBRARIES ${LIBUNWIND_LIB}) - if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64") + if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64|aarch64|arm64") if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64") find_library(LIBUNWIND_ARCH_LIB unwind-aarch64) else() @@ -77,7 +77,7 @@ if(ENABLE_LIBUNWIND AND UNIX AND NOT ANDROID) if(NOT LIBUNWIND_LIBRARIES) set(LIBUNWIND_LIBRARIES unwind) endif() - if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64") + if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64|aarch64|arm64") list(JOIN LIBUNWIND_LIBRARIES ";" _libunwind_libs_joined) if(NOT _libunwind_libs_joined MATCHES "unwind-x86_64" AND NOT _libunwind_libs_joined MATCHES "unwind-aarch64") if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64") From f4aea9fae072ef91b3df2a9a9f4f7d73d2b06adc Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Fri, 5 Jun 2026 13:10:14 +0200 Subject: [PATCH 2/2] Fix indentation --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a1d780b51..d73c35adc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,10 +61,10 @@ if(ENABLE_LIBUNWIND AND UNIX AND NOT ANDROID) set(LIBUNWIND_LIBRARIES ${LIBUNWIND_LIB}) if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64|aarch64|arm64") if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64") - find_library(LIBUNWIND_ARCH_LIB unwind-aarch64) - else() - find_library(LIBUNWIND_ARCH_LIB unwind-x86_64) - endif() + find_library(LIBUNWIND_ARCH_LIB unwind-aarch64) + else() + find_library(LIBUNWIND_ARCH_LIB unwind-x86_64) + endif() if(LIBUNWIND_ARCH_LIB) list(APPEND LIBUNWIND_LIBRARIES ${LIBUNWIND_ARCH_LIB}) endif() @@ -81,10 +81,10 @@ if(ENABLE_LIBUNWIND AND UNIX AND NOT ANDROID) list(JOIN LIBUNWIND_LIBRARIES ";" _libunwind_libs_joined) if(NOT _libunwind_libs_joined MATCHES "unwind-x86_64" AND NOT _libunwind_libs_joined MATCHES "unwind-aarch64") if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64") - find_library(LIBUNWIND_ARCH_LIB unwind-aarch64) - else() - find_library(LIBUNWIND_ARCH_LIB unwind-x86_64) - endif() + find_library(LIBUNWIND_ARCH_LIB unwind-aarch64) + else() + find_library(LIBUNWIND_ARCH_LIB unwind-x86_64) + endif() if(LIBUNWIND_ARCH_LIB) list(APPEND LIBUNWIND_LIBRARIES ${LIBUNWIND_ARCH_LIB}) else()