Update to 18.1.6

Related: RHEL-28670

compiler-rt.rpmlintrc

@@ -0,0 +1,7 @@
+# This is a devel package
+addFilter("W: devel-file-in-non-devel-package")
+
+# These symlinks are dangling on x64_64
+addFilter("compiler-rt.x86_64: W: dangling-relative-symlink /usr/lib64/clang/[0-9]+.[0-9]+.[0-9]+/")
+
+addFilter("E: hardcoded-library-path in ../../lib/clang/")

compiler-rt.spec

@@ -8,8 +8,14 @@
 
 %global toolchain clang
 
-%global maj_ver 17
-%global min_ver 0
+# Opt out of https://fedoraproject.org/wiki/Changes/fno-omit-frame-pointer
+# https://bugzilla.redhat.com/show_bug.cgi?id=2158587
+%undefine _include_frame_pointers
+
+%bcond_with compat_build
+
+%global maj_ver 18
+%global min_ver 1
 %global patch_ver 6
 #global rc_ver 4
 %if %{with snapshot_build}
@@ -22,13 +28,19 @@
 
 %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}
 Summary:	LLVM "compiler-rt" runtime libraries
@@ -60,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
@@ -108,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/*
@@ -127,6 +147,9 @@ mv %{buildroot}%{_prefix}/lib/clang/%{maj_ver}/lib/powerpc64le-redhat-linux-gnu
 %changelog
 %{?llvm_snapshot_changelog_entry}
 
+* Sun Jun 02 2024 Konrad Kleine <kkleine@redhat.com> - 18.1.6-1
+- Update to 18.1.6
+
 * Mon Dec 11 2023 Timm Bäder <tbaeder@redhat.com> - 17.0.6-1
 - Update to 17.0.6
 

sources

@@ -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.6.src.tar.xz) = 0594b6d21ec51b454fd120a5a9035640b92779694efbfe52e3353152b0e00078501017817c8bb076a73cf585a0469672ee958207be7deca3f0045942616b4bd8
+SHA512 (compiler-rt-18.1.6.src.tar.xz.sig) = 13e3192fb7f6f4b3ce7fe649216f41b100a369e7111475a9cac9b8d7756d0848fd0dc8d852e558a9ecb9bf79337e05a67e5543b9eed5c0c965a2202ffb9e2a85

tests/README.md

@@ -0,0 +1,6 @@
+# Gating testplans for compiler-rt
+
+The tests for compiler-rt are in a separate repo: https://src.fedoraproject.org/tests/compiler-rt
+This directory should contain only fmf plans (such as build-gating.fmf) which import
+the tests from the tests repo. This can be done using the "url" parameter of the
+plan's "discover" step. Reference: https://tmt.readthedocs.io/en/stable/spec/plans.html#fmf