llvm16.spec

@@ -15,11 +15,7 @@
 %endif
 
 %bcond_without compat_build
-%ifnarch riscv64
 %bcond_without check
-%else
-%bcond_with check
-%endif
 
 #global rc_ver 4
 %global maj_ver 16
@@ -28,12 +24,7 @@
 %global llvm_srcdir llvm-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:rc%{rc_ver}}.src
 %global cmake_srcdir cmake-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:rc%{rc_ver}}.src
 %global third_party_srcdir third-party-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:rc%{rc_ver}}.src
-%ifnarch riscv64
 %global _lto_cflags -flto=thin
-%else
-# riscv64: gold is not supported on riscv64
-%global _lto_cflags %{nil}
-%endif
 
 %if %{with compat_build}
 %global pkg_name llvm%{maj_ver}
@@ -84,7 +75,7 @@
 
 Name:		%{pkg_name}
 Version:	%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}
-Release:	5.6.riscv64%{?dist}
+Release:	5%{?dist}
 Summary:	The Low Level Virtual Machine
 
 License:	Apache-2.0 WITH LLVM-exception OR NCSA
@@ -252,7 +243,7 @@ mv %{third_party_srcdir} third-party
 
 %build
 
-%ifarch s390 s390x %{arm} %ix86 riscv64
+%ifarch s390 s390x %{arm} %ix86
 # Decrease debuginfo verbosity to reduce memory consumption during final library linking
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %endif
@@ -266,7 +257,7 @@ export ASMFLAGS=$CFLAGS
 	-DLLVM_PARALLEL_LINK_JOBS=1 \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
-%ifarch s390 %{arm} %ix86 riscv64
+%ifarch s390 %{arm} %ix86
 	-DCMAKE_C_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
 	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
 %endif
@@ -333,7 +324,8 @@ export ASMFLAGS=$CFLAGS
 	-DCMAKE_INSTALL_PREFIX=%{install_prefix} \
 	-DLLVM_INSTALL_SPHINX_HTML_DIR=%{_pkgdocdir}/html \
 	-DSPHINX_EXECUTABLE=%{_bindir}/sphinx-build-3 \
-	-DLLVM_INCLUDE_BENCHMARKS=OFF
+	-DLLVM_INCLUDE_BENCHMARKS=OFF \
+	-DLLVM_UNITTEST_LINK_FLAGS="-Wl,-plugin-opt=O0"
 
 # Build libLLVM.so first.  This ensures that when libLLVM.so is linking, there
 # are no other compile jobs running.  This will help reduce OOM errors on the
@@ -580,20 +572,6 @@ fi
 %endif
 
 %changelog
-* Tue Nov 07 2023 David Abdurachmanov <davidlt@rivosinc.com> - 16.0.6-5.5.riscv64
-- Remove -plugin-opt for unittests
-
-* Tue Nov 07 2023 David Abdurachmanov <davidlt@rivosinc.com> - 16.0.6-5.2.riscv64
-- Bring back -plugin-opt for unittests
-
-* Thu Nov 02 2023 David Abdurachmanov <davidlt@rivosinc.com> - 16.0.6-5.1.riscv64
-- Remove -plugin-opt for unittests
-
-* Mon Oct 30 2023 David Abdurachmanov <davidlt@rivosinc.com> - 16.0.6-5.0.riscv64
-- Disable tests on riscv64 for now
-- Lower memory consumption on riscv64
-- Disable LTO (ld.gold not supported on riscv64)
-
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 16.0.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild