Add support for riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
18.1.1 Release
2024-03-28 12:28:06 +02:00 · 2024-03-13 01:28:20 +00:00 · 2024-02-29 06:32:13 +00:00 · 2024-02-27 00:18:51 +00:00 · 2024-01-24 07:51:42 +00:00 · 2024-01-19 16:01:01 +00:00
2 changed files with 45 additions and 8 deletions
--- a/compiler-rt.spec
+++ b/compiler-rt.spec
@ -12,9 +12,11 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=2158587
 %undefine _include_frame_pointers

-%global maj_ver 17
-%global min_ver 0
-%global patch_ver 6
+%bcond_with compat_build
+
+%global maj_ver 18
+%global min_ver 1
+%global patch_ver 1
 #global rc_ver 4
 %if %{with snapshot_build}
 %global maj_ver %{llvm_snapshot_version_major}
@ -26,15 +28,21 @@

 %global crt_srcdir compiler-rt-%{compiler_rt_version}%{?rc_ver:rc%{rc_ver}}.src

+%if %{with compat_build}
+%global pkg_name compiler-rt%{maj_ver}
+%else
+%global pkg_name compiler-rt
+%endif
+
 # see https://sourceware.org/bugzilla/show_bug.cgi?id=25271
 %global optflags %(echo %{optflags} -D_DEFAULT_SOURCE)

 # see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93615
 %global optflags %(echo %{optflags} -Dasm=__asm__)

-Name:		compiler-rt
+Name:		%{pkg_name}
 Version:	%{compiler_rt_version}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
-Release:	1%{?dist}
+Release:	1.0.riscv64%{?dist}
 Summary:	LLVM "compiler-rt" runtime libraries

 License:	Apache-2.0 WITH LLVM-exception OR NCSA OR MIT
@ -64,6 +72,7 @@ BuildRequires:	zlib-devel
 BuildRequires:	gnupg2

 Requires: clang-resource-filesystem%{?isa} = %{version}
+Provides: %{name}(major) = %{maj_ver}

 %description
 The compiler-rt project is a part of the LLVM project. It provides
@ -112,13 +121,20 @@ export ASMFLAGS=$CFLAGS
 # by clang.
 mv %{buildroot}%{_prefix}/lib/clang/%{maj_ver}/lib/powerpc64le-redhat-linux-gnu %{buildroot}%{_prefix}/lib/clang/%{maj_ver}/lib/ppc64le-redhat-linux-gnu
 %endif
+%ifarch %{ix86}
+# Fix install path on ix86 so that the directory name matches the triple used
+# by clang on both actual ix86 and on x86_64 with -m32:
+%if "%{_target_cpu}" != "i386"
+ln -s i386-redhat-linux-gnu %{buildroot}%{_prefix}/lib/clang/%{maj_ver}/lib/%{_target_cpu}-redhat-linux-gnu
+%endif
+%endif

 %check
 #%%cmake_build --target check-compiler-rt

 %files
 %license LICENSE.TXT
-%ifarch x86_64 aarch64
+%ifarch x86_64 aarch64 riscv64
 %{_prefix}/lib/clang/%{maj_ver}/bin/*
 %endif
 %{_prefix}/lib/clang/%{maj_ver}/include/*
@ -129,8 +145,29 @@ mv %{buildroot}%{_prefix}/lib/clang/%{maj_ver}/lib/powerpc64le-redhat-linux-gnu
 #%endif

 %changelog
+* Thu Mar 28 2024 David Abdurachmanov <davidlt@rivosinc.com> - 18.1.1-1.0.riscv64
+- Add support for riscv64
+
+* Tue Mar 12 2024 Tom Stellard <tstellar@redhat.com> - 18.1.1-1
+- 18.1.1 Release
+
+* Wed Feb 28 2024 Tom Stellard <tstellar@redhat.com> - 18.1.0~rc4-1
+- 18.1.0-rc4 Release
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 17.0.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 17.0.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 %{?llvm_snapshot_changelog_entry}

+* Mon Dec 18 2023 Jeremy Newton <alexjnewt at hotmail dot com> - 17.0.6-3
+- Add compiler-rt(major) provides
+
+* Wed Dec 13 2023 Miro Hrončok <mhroncok@redhat.com> - 17.0.6-2
+- Fix install path on i686
+
 * Wed Nov 29 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 17.0.6-1
 - Update to LLVM 17.0.6

--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (compiler-rt-17.0.6.src.tar.xz) = 56dc9d304dd4ba8d28179077dd99ca7c820ce26dbc70d33b2ba41769928adc900f7618d3efef756b2fc92e322d2f25dba49be966d6583d2d8f1fce9283a9cdf7
-SHA512 (compiler-rt-17.0.6.src.tar.xz.sig) = 3f1e21299fee7ab20fbeb61740049fb0ad61ceeaa8abec000c415320526dd84006d2d82161ff6ed63b33f0c1fd3937647e5eac5341cbeab602edaf70a8b875cd
+SHA512 (compiler-rt-18.1.1.src.tar.xz) = 99a5b855df97c40e1893437c09987e075732e81c851a7dd9af205c397ad13d56de398bc5c81e2558b50fd9483eea7248149f3e26df25e44776d21daf9a1a21a0
+SHA512 (compiler-rt-18.1.1.src.tar.xz.sig) = 3618933fbe55a39cfea24d5072146edb74182f0fea7143ed014fe22217e961098252da8c4714ed919db444a52473848e92075f84d816d406145889acd8c7a1b3
Author	SHA1	Message	Date
David Abdurachmanov	9b829bc931	Add support for riscv64 Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>	2024-03-28 12:28:06 +02:00
Tom Stellard	2cb56924b7	18.1.1 Release	2024-03-13 01:28:20 +00:00
Tom Stellard	47827775e4	18.1.0-rc4 Release	2024-02-29 06:32:13 +00:00
Tom Stellard	f0ee285ff1	Add compat package	2024-02-27 00:18:51 +00:00
Fedora Release Engineering	0544768b12	Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild	2024-01-24 07:51:42 +00:00
Fedora Release Engineering	835c87fc83	Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild	2024-01-19 16:01:01 +00:00
Jeremy Newton	7d3d8b8866	Add compiler-rt(major) provides When building ROCm components, we need to pull in specific llvm and compiler-rt package versions. This add compiler-rt(major) in the style of llvm-devel(major), as they can be used as a build requires.	2024-01-17 09:38:17 -03:00
Miro Hrončok	5e9ea9c1cf	Fix install path on i686 See https://src.fedoraproject.org/rpms/rapidfuzz-cpp/pull-request/1#comment-172023 [ 43%] Linking CXX executable fuzz_osa_distance cd /builddir/build/BUILD/rapidfuzz-cpp-2.2.3/redhat-linux-build/fuzzing && /usr/bin/cmake -E cmake_link_script CMakeFiles/fuzz_osa_distance.dir/link.txt --verbose=1 /usr/bin/clang++ -O2 -flto=thin -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS --config /usr/lib/rpm/redhat/redhat-hardened-clang.cfg -fstack-protector-strong -m32 -march=i686 -mtune=generic -msse2 -mfpmath=sse -mstackrealign -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -Wl,-z,relro -Wl,--as-needed -Wl,-z,now -flto=thin -Wl,--build-id=sha1 CMakeFiles/fuzz_osa_distance.dir/fuzz_osa_distance.cpp.o -o fuzz_osa_distance -fsanitize=fuzzer,address /usr/bin/ld: cannot find /usr/bin/../lib/clang/17/lib/linux/libclang_rt.fuzzer-i386.a: No such file or directory /usr/bin/ld: cannot find /usr/bin/../lib/clang/17/lib/linux/libclang_rt.asan_static-i386.a: No such file or directory /usr/bin/ld: cannot find /usr/bin/../lib/clang/17/lib/linux/libclang_rt.asan-i386.a: No such file or directory /usr/bin/ld: cannot find /usr/bin/../lib/clang/17/lib/linux/libclang_rt.asan_cxx-i386.a: No such file or directory clang++: error: linker command failed with exit code 1 (use -v to see invocation) Note that renaming the directory is not enough, because clang -m32 on x86_64 expects the i386 name.	2023-12-14 11:12:22 +01:00