.compiler-rt.metadata

@@ -1,4 +1,2 @@
-0de534cfef38697e115c3ae80634765f05e78e5b SOURCES/cmake-16.0.6.src.tar.xz
+6ecbfa5516b60adb4e4e60f991b0d8ddf5aab12a SOURCES/compiler-rt-18.1.8.src.tar.xz
-2db5c88fe9277bb0fa85f49b58e946e49ff235c2 SOURCES/cmake-16.0.6.src.tar.xz.sig
+7aa7c3702e6f12f4426c83a232de1349eacbadf2 SOURCES/compiler-rt-18.1.8.src.tar.xz.sig
-28ddc89aac54cbfa6d0a0cd07a14bbd3f3a01d5f SOURCES/compiler-rt-16.0.6.src.tar.xz
-7374cad6da4c3c936c26e72175bdff52ab3e98e5 SOURCES/compiler-rt-16.0.6.src.tar.xz.sig

.gitignore

@@ -1,4 +1,2 @@
-SOURCES/cmake-16.0.6.src.tar.xz
+SOURCES/compiler-rt-18.1.8.src.tar.xz
-SOURCES/cmake-16.0.6.src.tar.xz.sig
+SOURCES/compiler-rt-18.1.8.src.tar.xz.sig
-SOURCES/compiler-rt-16.0.6.src.tar.xz
-SOURCES/compiler-rt-16.0.6.src.tar.xz.sig

SOURCES/0001-compiler-rt-Fix-FLOAT16-feature-detection.patch

@@ -14,23 +14,23 @@ diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/
 index 2fc70522895f..e83a1ecea50b 100644
 --- a/compiler-rt/lib/builtins/CMakeLists.txt
 +++ b/compiler-rt/lib/builtins/CMakeLists.txt
-@@ -12,7 +12,6 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+@@ -5,7 +5,6 @@
-       "at least 3.20.0 now to avoid issues in the future!")
+ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
-   endif()
+   cmake_minimum_required(VERSION 3.20.0)
  
 -  set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
    project(CompilerRTBuiltins C ASM)
    set(COMPILER_RT_STANDALONE_BUILD TRUE)
    set(COMPILER_RT_BUILTINS_STANDALONE_BUILD TRUE)
-@@ -56,6 +55,8 @@ if (COMPILER_RT_STANDALONE_BUILD)
+@@ -50,6 +49,8 @@ if (COMPILER_RT_STANDALONE_BUILD)
-     "Turns on or off -fPIC for the builtin library source"
      ON)
  endif()
-+  
-+set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
  
++set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
++
  include(builtin-config-ix)
+ include(CMakeDependentOption)
  include(CMakePushCheckState)
 -- 
-2.40.1
+2.41.0
 

SPECS/compiler-rt.spec

@@ -1,12 +1,38 @@
+%bcond_with snapshot_build
+
+%if %{with snapshot_build}
+# Unlock LLVM Snapshot LUA functions
+%{llvm_sb_verbose}
+%{llvm_sb}
+%endif
+
 %global toolchain clang
 
-%global maj_ver 16
+# Opt out of https://fedoraproject.org/wiki/Changes/fno-omit-frame-pointer
-%global min_ver 0
+# https://bugzilla.redhat.com/show_bug.cgi?id=2158587
-%global patch_ver 6
+%undefine _include_frame_pointers
+
+%bcond_with compat_build
+
+%global maj_ver 18
+%global min_ver 1
+%global patch_ver 8
+#global rc_ver 4
+%if %{with snapshot_build}
+%global maj_ver %{llvm_snapshot_version_major}
+%global min_ver %{llvm_snapshot_version_minor}
+%global patch_ver %{llvm_snapshot_version_patch}
+%undefine rc_ver
+%endif
 %global compiler_rt_version %{maj_ver}.%{min_ver}.%{patch_ver}
 
 %global crt_srcdir compiler-rt-%{compiler_rt_version}%{?rc_ver:rc%{rc_ver}}.src
-%global cmake_srcdir cmake-%{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)
@@ -14,18 +40,21 @@
 # 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}
+Version:	%{compiler_rt_version}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	LLVM "compiler-rt" runtime libraries
 
 License:	Apache-2.0 WITH LLVM-exception OR NCSA OR MIT
 URL:		http://llvm.org
+%if %{with snapshot_build}
+Source0:    %{llvm_snapshot_source_prefix}compiler-rt-%{llvm_snapshot_yyyymmdd}.src.tar.xz
+%{llvm_snapshot_extra_source_tags}
+%else
 Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}%{?rc_ver:-rc%{rc_ver}}/%{crt_srcdir}.tar.xz
 Source1:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}%{?rc_ver:-rc%{rc_ver}}/%{crt_srcdir}.tar.xz.sig
 Source2:	release-keys.asc
-Source3:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz
+%endif
-Source4:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz.sig
 
 Patch0:		0001-compiler-rt-Fix-FLOAT16-feature-detection.patch
 
@@ -36,11 +65,14 @@ BuildRequires:	python3
 # We need python3-devel for %%py3_shebang_fix
 BuildRequires:	python3-devel
 BuildRequires:	llvm-devel = %{version}
+BuildRequires:	llvm-cmake-utils = %{version}
+BuildRequires:	zlib-devel
 
 # For gpg source verification
 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
@@ -50,14 +82,11 @@ instrumentation, and Blocks C language extension.
 
 %prep
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
-%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE4}' --data='%{SOURCE3}'
-%setup -T -q -b 3 -n %{cmake_srcdir}
-# TODO: It would be more elegant to set -DLLVM_COMMON_CMAKE_UTILS=%{_builddir}/%{cmake_srcdir},
-# but this is not a CACHED variable, so we can't actually set it externally :(
-cd ..
-mv %{cmake_srcdir} cmake
 %autosetup -n %{crt_srcdir} -p2
 
+# compiler-rt does not allow configuring LLVM_COMMON_CMAKE_UTILS.
+ln -s %{_datadir}/llvm/cmake ../cmake
+
 %py3_shebang_fix lib/hwasan/scripts/hwasan_symbolize
 
 %build
@@ -68,6 +97,12 @@ export ASMFLAGS=$CFLAGS
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DCMAKE_MODULE_PATH=%{_libdir}/cmake/llvm \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
+	-DCOMPILER_RT_INSTALL_PATH=%{_prefix}/lib/clang/%{maj_ver} \
+	-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON \
+	\
+%if %{with snapshot_build}
+	-DLLVM_VERSION_SUFFIX="%{llvm_snapshot_version_suffix}" \
+%endif
 	\
 %if 0%{?__isa_bits} == 64
 	-DLLVM_LIBDIR_SUFFIX=64 \
@@ -81,51 +116,52 @@ export ASMFLAGS=$CFLAGS
 %install
 
 %cmake_install
-
+%ifarch ppc64le
-# move blacklist/abilist files to where clang expect them
+# Fix install path on ppc64le so that the directory name matches the triple used
-mkdir -p %{buildroot}%{_libdir}/clang/%{maj_ver}/share
+# by clang.
-mv -v %{buildroot}%{_datadir}/*list.txt  %{buildroot}%{_libdir}/clang/%{maj_ver}/share/
+mv %{buildroot}%{_prefix}/lib/clang/%{maj_ver}/lib/powerpc64le-redhat-linux-gnu %{buildroot}%{_prefix}/lib/clang/%{maj_ver}/lib/ppc64le-redhat-linux-gnu
-
+%endif
-# move sanitizer libs to better place
+%ifarch %{ix86}
-%global libclang_rt_installdir lib/linux
+# Fix install path on ix86 so that the directory name matches the triple used
-mkdir -p %{buildroot}%{_libdir}/clang/%{maj_ver}/lib
+# by clang on both actual ix86 and on x86_64 with -m32:
-mv -v %{buildroot}%{_prefix}/%{libclang_rt_installdir}/*_rt* %{buildroot}%{_libdir}/clang/%{maj_ver}/lib
+%if "%{_target_cpu}" != "i386"
-mkdir -p %{buildroot}%{_libdir}/clang/%{maj_ver}/lib/linux/
+ln -s i386-redhat-linux-gnu %{buildroot}%{_prefix}/lib/clang/%{maj_ver}/lib/%{_target_cpu}-redhat-linux-gnu
-pushd %{buildroot}%{_libdir}/clang/%{maj_ver}/lib
+%endif
-for i in *.a *.so
-do
-	ln -s ../$i linux/$i
-done
-
-# multilib support: also create symlink from lib to lib64, fixes rhbz#1678240
-# the symlinks will be dangling if the 32 bits version is not installed, but that should be fine
-%ifarch x86_64
-
-mkdir -p %{buildroot}/%{_exec_prefix}/lib/clang/%{maj_ver}/lib/linux
-for i in *.a *.so
-do
-	target=`echo "$i" | sed -e 's/x86_64/i386/'`
-	ln -s ../../../../../lib/clang/%{maj_ver}/lib/$target ../../../../%{_lib}/clang/%{maj_ver}/lib/linux/
-done
-
 %endif
-
-popd
 
 %check
-
 #%%cmake_build --target check-compiler-rt
 
 %files
 %license LICENSE.TXT
-%{_includedir}/*
+%ifarch x86_64 aarch64 riscv64
-%{_libdir}/clang/%{maj_ver}/lib/*
+%{_prefix}/lib/clang/%{maj_ver}/bin/*
-%{_libdir}/clang/%{maj_ver}/share/*
-%ifarch x86_64 aarch64
-%{_bindir}/hwasan_symbolize
 %endif
+%{_prefix}/lib/clang/%{maj_ver}/include/*
+%{_prefix}/lib/clang/%{maj_ver}/lib/*
+%{_prefix}/lib/clang/%{maj_ver}/share/*
+#%ifarch x86_64 aarch64
+#{_bindir}/hwasan_symbolize
+#%endif
 
 %changelog
+%{?llvm_snapshot_changelog_entry}
+
+* Wed Jul 17 2024 Konrad Kleine <kkleine@redhat.com> - 18.1.8-1
+- Update to 18.1.8
+
+* Tue Jun 11 2024 Nikita Popov <npopov@redhat.com> - 18.1.6-2
+- Rebuild with new clang
+
+* 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
+
+* Wed Oct 04 2023 Timm Bäder <tbaeder@redhat.com> - 17.0.1-1
+- Update to 17.0.1
+
 * Tue Aug 29 2023 Tom Stellard <tstellar@redhat.com> - 16.0.6-2
 - Fix FLOAT16 detection