From e9ba1439ddf7e533d6afbf4c0b1506bd1cc46c64 Mon Sep 17 00:00:00 2001 From: laokz Date: Sun, 18 Feb 2024 15:00:27 +0800 Subject: [PATCH] Add riscv64 to os-triple patch Signed-off-by: laokz --- ...for-X86_64-AArch64-Riscv64-openEuler-gcc.patch | 15 ++++++++++++--- clang.spec | 7 +++++-- 2 files changed, 17 insertions(+), 5 deletions(-) rename 0001-Add-triples-for-X86_64-AArch64-openEuler-gcc.patch => 0001-Add-triples-for-X86_64-AArch64-Riscv64-openEuler-gcc.patch (68%) diff --git a/0001-Add-triples-for-X86_64-AArch64-openEuler-gcc.patch b/0001-Add-triples-for-X86_64-AArch64-Riscv64-openEuler-gcc.patch similarity index 68% rename from 0001-Add-triples-for-X86_64-AArch64-openEuler-gcc.patch rename to 0001-Add-triples-for-X86_64-AArch64-Riscv64-openEuler-gcc.patch index a2066f0..5b75b97 100644 --- a/0001-Add-triples-for-X86_64-AArch64-openEuler-gcc.patch +++ b/0001-Add-triples-for-X86_64-AArch64-Riscv64-openEuler-gcc.patch @@ -1,11 +1,11 @@ From a833e7fa829764f8e3bf6b059c9e91080ca55253 Mon Sep 17 00:00:00 2001 From: liyunfei Date: Mon, 24 Jul 2023 19:16:45 +0800 -Subject: [PATCH] Add triples for X86_64/AArch64 openEuler gcc +Subject: [PATCH] Add triples for X86_64/AArch64/Riscv64 openEuler gcc --- - clang/lib/Driver/ToolChains/Gnu.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + clang/lib/Driver/ToolChains/Gnu.cpp | 6 ++-- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp index 665cdc3132fb..fc56935e7513 100644 @@ -29,5 +29,14 @@ index 665cdc3132fb..fc56935e7513 100644 static const char *const X32Triples[] = {"x86_64-linux-gnux32", "x86_64-pc-linux-gnux32"}; static const char *const X32LibDirs[] = {"/libx32", "/lib"}; +@@ -2404,7 +2404,7 @@ + static const char *const RISCV64LibDirs[] = {"/lib64", "/lib"}; + static const char *const RISCV64Triples[] = {"riscv64-unknown-linux-gnu", + "riscv64-linux-gnu", +- "riscv64-unknown-elf"}; ++ "riscv64-unknown-elf", "riscv64-openEuler-linux"}; + + static const char *const SPARCv8LibDirs[] = {"/lib32", "/lib"}; + static const char *const SPARCv8Triples[] = {"sparc-linux-gnu", -- 2.28.0.windows.1 diff --git a/clang.spec b/clang.spec index a83870a..38f7626 100644 --- a/clang.spec +++ b/clang.spec @@ -36,7 +36,7 @@ Name: %{pkg_name} Version: %{clang_version} -Release: 3 +Release: 4 Summary: A C language family front-end for LLVM License: NCSA @@ -45,7 +45,7 @@ Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_ Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}/%{clang_tools_srcdir}.tar.xz Patch0: fedora-PATCH-clang-Don-t-install-static-libraries.patch -Patch1: 0001-Add-triples-for-X86_64-AArch64-openEuler-gcc.patch +Patch1: 0001-Add-triples-for-X86_64-AArch64-Riscv64-openEuler-gcc.patch # Patches for clang-tools-extra # See https://reviews.llvm.org/D120301 @@ -373,6 +373,9 @@ LD_LIBRARY_PATH=%{buildroot}/%{install_libdir} %{__ninja} check-all -C ./_build %{install_bindir}/git-clang-format %changelog +* Sun Feb 18 2024 laokz -17.0.6-4 +- Add riscv64 to os-triple patch + * Thu Jan 25 2024 liyunfei -17.0.6-3 - Add Buildrequires: llvm-libs -- Gitee