From 85a597e8b0e2dd9199405738861eaae3d8035b49 Mon Sep 17 00:00:00 2001
From: David Abdurachmanov <davidlt@rivosinc.com>
Date: Wed, 5 Oct 2022 21:13:21 +0300
Subject: [PATCH] Prepare for riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
---
 clang.spec | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/clang.spec b/clang.spec
index 56de2fd..cf6c173 100644
--- a/clang.spec
+++ b/clang.spec
@@ -41,7 +41,7 @@
 
 Name:		%pkg_name
 Version:	%{clang_version}%{?rc_ver:~rc%{rc_ver}}
-Release:	2%{?dist}
+Release:	2.0.riscv64%{?dist}
 Summary:	A C language family front-end for LLVM
 
 License:	NCSA
@@ -287,7 +287,7 @@ rm test/CodeGen/profile-filter.c
 # Use ThinLTO to limit build time.
 %define _lto_cflags -flto=thin
 # And disable LTO on AArch64 entirely.
-%ifarch aarch64
+%ifarch aarch64 riscv64
 %define _lto_cflags %{nil}
 %endif
 
@@ -297,7 +297,7 @@ sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@/64/g' test/lit.cfg.py
 sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@//g' test/lit.cfg.py
 %endif
 
-%ifarch s390 s390x %{arm} aarch64 %ix86 ppc64le
+%ifarch s390 s390x %{arm} aarch64 %ix86 ppc64le riscv64
 # Decrease debuginfo verbosity to reduce memory consumption during final library linking
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %endif
@@ -318,7 +318,7 @@ sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@//g' test/lit.cfg.py
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DPYTHON_EXECUTABLE=%{__python3} \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
-%ifarch s390 s390x %{arm} %ix86 ppc64le
+%ifarch s390 s390x %{arm} %ix86 ppc64le riscv64
 	-DCMAKE_C_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
 	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
 %endif
@@ -465,9 +465,9 @@ ln -s %{_datadir}/clang/clang-format-diff.py %{buildroot}%{_bindir}/clang-format
 %if %{without compat_build}
 %if %{with check}
 # requires lit.py from LLVM utilities
-# FIXME: Fix failing ARM tests
+# FIXME: Fix failing ARM & RISCV64 tests
 LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{__ninja} check-all -C %{__cmake_builddir} || \
-%ifarch %{arm}
+%ifarch %{arm} riscv64
 :
 %else
 false
@@ -596,6 +596,10 @@ false
 
 %endif
 %changelog
+* Wed Oct 05 2022 David Abdurachmanov <davidlt@rivosinc.com> - 15.0.0-2.0.riscv64
+- Ignore test suite failures on riscv64 for now
+- Prepare for riscv64
+
 * Wed Sep 14 2022 Nikita Popov <npopov@redhat.com> - 15.0.0-2
 - Downgrade implicit int and implicit function declaration to warning only