From 530d8ffdcca43bdcf6253368a76e11303ca169c0 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Thu, 28 Mar 2024 13:26:10 +0200 Subject: [PATCH] Allow vendor (redhat) triplet for riscv64 Signed-off-by: David Abdurachmanov --- 0001-riscv-use-vendor-triplet.patch | 27 +++++++++++++++++++++++++++ clang.spec | 8 +++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0001-riscv-use-vendor-triplet.patch diff --git a/0001-riscv-use-vendor-triplet.patch b/0001-riscv-use-vendor-triplet.patch new file mode 100644 index 0000000..98e9646 --- /dev/null +++ b/0001-riscv-use-vendor-triplet.patch @@ -0,0 +1,27 @@ +From cabe78b47111a6e8935d9ca29bc31f63d8e3b290 Mon Sep 17 00:00:00 2001 +From: David Abdurachmanov +Date: Thu, 28 Mar 2024 11:21:44 +0000 +Subject: [PATCH] riscv use vendor triplet + +Signed-off-by: David Abdurachmanov +--- + clang/lib/Driver/ToolChains/Gnu.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp +index f4c9bcb5..3bdd2f2d 100644 +--- a/clang/lib/Driver/ToolChains/Gnu.cpp ++++ b/clang/lib/Driver/ToolChains/Gnu.cpp +@@ -2558,7 +2558,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( + 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-redhat-linux"}; + + static const char *const SPARCv8LibDirs[] = {"/lib32", "/lib"}; + static const char *const SPARCv8Triples[] = {"sparc-linux-gnu", +-- +2.44.0 + diff --git a/clang.spec b/clang.spec index 3833f8c..fca3e42 100644 --- a/clang.spec +++ b/clang.spec @@ -78,7 +78,7 @@ Name: %pkg_name Version: %{clang_version}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}} -Release: 1.0.riscv64%{?dist} +Release: 1.1.riscv64%{?dist} Summary: A C language family front-end for LLVM License: Apache-2.0 WITH LLVM-exception OR NCSA @@ -106,6 +106,9 @@ Patch2: 0003-PATCH-clang-Don-t-install-static-libraries.patch # More info is available here: https://reviews.llvm.org/D159115#4641826 Patch5: 0001-Workaround-a-bug-in-ORC-on-ppc64le.patch +# RISCV vendor triplet +Path6: 0001-riscv-use-vendor-triplet.patch + # RHEL specific patches # Avoid unwanted dependency on python-myst-parser Patch101: 0009-disable-myst-parser.patch @@ -708,6 +711,9 @@ LD_LIBRARY_PATH=%{buildroot}/%{install_libdir} %{__ninja} check-all -C %{__cmake %endif %changelog +* Thu Mar 28 2024 David Abdurachmanov - 18.1.1-1.1.riscv64 +- Allow vendor triplet for riscv64 + * Wed Mar 27 2024 David Abdurachmanov - 18.1.1-1.0.riscv64 - Add support for riscv64