From d41424dc0a28f959c01d336df88e3501e0fc4314 Mon Sep 17 00:00:00 2001 From: laokz Date: Fri, 13 Oct 2023 21:30:10 +0800 Subject: [PATCH] enalbe assembly source for riscv64 Per https://github.com/llvm/llvm-project/issues/59978 , the CMakeLists.txt didn't enable ASM language. For riscv64, some functions are implmented only by some assembly sources. --- ...nable-cmake-ASM-language-for-riscv64.patch | 31 +++++++++++++++++++ llvm-libunwind.spec | 7 ++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 1000-enable-cmake-ASM-language-for-riscv64.patch diff --git a/1000-enable-cmake-ASM-language-for-riscv64.patch b/1000-enable-cmake-ASM-language-for-riscv64.patch new file mode 100644 index 0000000..ce64294 --- /dev/null +++ b/1000-enable-cmake-ASM-language-for-riscv64.patch @@ -0,0 +1,31 @@ +From 60bbf65459741d7f16f43f23166f479b855fb069 Mon Sep 17 00:00:00 2001 +From: laokz +Date: Mon, 23 Oct 2023 11:36:41 +0800 +Subject: [PATCH] enable cmake ASM language for riscv64 + +Some RISC-V functions are implemented in .S files. +CMakeLists.txt disable ASM lang by default. Turn it on. + +Signed-off-by: laokz +--- + CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5a06805..90e8ada 100644 +--- a/a/CMakeLists.txt ++++ a/b/CMakeLists.txt +@@ -4,6 +4,10 @@ + + cmake_minimum_required(VERSION 3.13.4) + ++if(CMAKE_SYSTEM_PROCESSOR MATCHES riscv64) ++ enable_language(ASM) ++endif() ++ + set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") + + # Add path for custom modules +-- +2.42.0 + diff --git a/llvm-libunwind.spec b/llvm-libunwind.spec index ba25f2d..deb0d41 100644 --- a/llvm-libunwind.spec +++ b/llvm-libunwind.spec @@ -24,7 +24,7 @@ Name: %{pkg_name} Version: %{libunwind_version} -Release: 1 +Release: 2 Summary: LLVM libunwind @@ -33,6 +33,8 @@ URL: http://llvm.org Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libunwind_version}/%{libunwind_srcdir}.tar.xz Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libunwind_version}/%{libunwind_srcdir}.tar.xz.sig +Patch1000: 1000-enable-cmake-ASM-language-for-riscv64.patch + BuildRequires: clang BuildRequires: cmake BuildRequires: ninja-build @@ -120,5 +122,8 @@ popd %{install_libdir}/libunwind.a %changelog +* Fri Oct 13 2023 laokz - 15.0.7-2 +- enable assembly source for riscv64 + * Tue Jul 04 2023 cf-zhao - 15.0.7-1 - Initial release -- Gitee