.compiler-rt.metadata

@@ -1,2 +1,2 @@
-6ecbfa5516b60adb4e4e60f991b0d8ddf5aab12a SOURCES/compiler-rt-18.1.8.src.tar.xz
+40f2a886636168f6478e20933906bcece2fd6b97 SOURCES/compiler-rt-15.0.7.src.tar.xz
-7aa7c3702e6f12f4426c83a232de1349eacbadf2 SOURCES/compiler-rt-18.1.8.src.tar.xz.sig
+347bdd5ee6d6b93c9644c268511815912c0fb2dc SOURCES/release-keys.asc

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/compiler-rt-18.1.8.src.tar.xz
+SOURCES/compiler-rt-15.0.7.src.tar.xz
-SOURCES/compiler-rt-18.1.8.src.tar.xz.sig
+SOURCES/release-keys.asc

SOURCES/0001-Fix-page-size-constant-on-aarch64-and-ppc64le.patch

@@ -1,25 +0,0 @@
-From 5f73befe5a0df82e455f4b1052e62f34009e98bb Mon Sep 17 00:00:00 2001
-From: Tom Stellard <tstellar@redhat.com>
-Date: Tue, 23 Apr 2024 15:08:34 -0700
-Subject: [PATCH] Fix page size constant on aarch64 and ppc64le
-
----
- compiler-rt/lib/cfi/cfi.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/compiler-rt/lib/cfi/cfi.cpp b/compiler-rt/lib/cfi/cfi.cpp
-index ad1c91623514..e7e86e5807a8 100644
---- a/compiler-rt/lib/cfi/cfi.cpp
-+++ b/compiler-rt/lib/cfi/cfi.cpp
-@@ -53,6 +53,8 @@ namespace __cfi {
- 
- #if SANITIZER_LOONGARCH64
- #define kCfiShadowLimitsStorageSize 16384 // 16KiB on loongarch64 per page
-+#elif defined(__aarch64__) || defined(__powerpc64__)
-+#define kCfiShadowLimitsStorageSize 65536 // 1 page
- #else
- #define kCfiShadowLimitsStorageSize 4096 // 1 page
- #endif
--- 
-2.40.1
-

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

@@ -1,36 +0,0 @@
-From ce15f52198639e9195b8833ed60dc1a49c293956 Mon Sep 17 00:00:00 2001
-From: Tom Stellard <tstellar@redhat.com>
-Date: Tue, 29 Aug 2023 15:49:55 -0700
-Subject: [PATCH] compiler-rt: Fix FLOAT16 feature detection
-
-CMAKE_TRY_COMPILE_TARGET_TYPE defaults to EXECUTABLE, which causes
-any feature detection code snippet without a main function to fail,
-so we need to make sure it gets explicitly set to STATIC_LIBRARY.
----
- compiler-rt/lib/builtins/CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt
-index 2fc70522895f..e83a1ecea50b 100644
---- a/compiler-rt/lib/builtins/CMakeLists.txt
-+++ b/compiler-rt/lib/builtins/CMakeLists.txt
-@@ -5,7 +5,6 @@
- if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
-   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)
-@@ -50,6 +49,8 @@ if (COMPILER_RT_STANDALONE_BUILD)
-     ON)
- endif()
- 
-+set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
-+
- include(builtin-config-ix)
- include(CMakeDependentOption)
- include(CMakePushCheckState)
--- 
-2.41.0
-

SOURCES/add-llvm-cmake-package.patch

@@ -0,0 +1,37 @@
+commit b18bde7a9bd6ed80f5721c47c805f0158b4fe9f8
+Author: Timm Bäder <tbaeder@redhat.com>
+Date:   Wed Mar 9 07:17:21 2022 +0100
+
+    [compiler-rt] Add LLVM cmake package in standalone builds
+    
+    So the other files from the toplevel cmake/Modules directory have a
+    chance of being found.
+
+diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
+index 3a41aa43e406..6516e10fa3c5 100644
+--- a/compiler-rt/CMakeLists.txt
++++ b/compiler-rt/CMakeLists.txt
+@@ -28,6 +28,12 @@ else()
+   set(CMAKE_CFG_RESOLVED_INTDIR "")
+ endif()
+ 
++if(COMPILER_RT_STANDALONE_BUILD)
++  # Needed to find the other modules from the toplevel cmake/Modules dir
++  find_package(LLVM REQUIRED HINTS "${LLVM_CMAKE_DIR}")
++  list(APPEND CMAKE_MODULE_PATH "${LLVM_DIR}")
++endif()
++
+ include(SetPlatformToolchainTools)
+ include(base-config-ix)
+ include(CompilerRTUtils)
+diff --git a/compiler-rt/test/CMakeLists.txt b/compiler-rt/test/CMakeLists.txt
+index 5c2b634e1180..098fb0481517 100644
+--- a/compiler-rt/test/CMakeLists.txt
++++ b/compiler-rt/test/CMakeLists.txt
+@@ -1,6 +1,3 @@
+-# Needed for lit support in standalone builds.
+-include(AddLLVM)
+-
+ option(COMPILER_RT_TEST_STANDALONE_BUILD_LIBS
+   "When set to ON and testing in a standalone build, test the runtime \
+   libraries built by this standalone build rather than the runtime libraries \

SOURCES/fix-page-size-constant.patch

@@ -0,0 +1,15 @@
+diff -ruN compiler-rt-14.0.0.src.orig/lib/cfi/cfi.cpp compiler-rt-14.0.0.src/lib/cfi/cfi.cpp
+--- a/compiler-rt-14.0.0.src.orig/lib/cfi/cfi.cpp	2022-03-14 10:44:55.000000000 +0100
++++ b/compiler-rt-14.0.0.src/lib/cfi/cfi.cpp	2022-05-25 17:03:51.114415534 +0200
+@@ -51,7 +51,11 @@
+ 
+ namespace __cfi {
+ 
++#if defined(__aarch64__) || defined(__powerpc64__)
++#define kCfiShadowLimitsStorageSize 65536 // 1 page
++#else
+ #define kCfiShadowLimitsStorageSize 4096 // 1 page
++#endif
+ // Lets hope that the data segment is mapped with 4K pages.
+ // The pointer to the cfi shadow region is stored at the start of this page.
+ // The rest of the page is unused and re-mapped read-only.

SOURCES/release-keys.asc

@@ -1,104 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-9RmlwZlOTFGcWBYl/cfRONn9qi9a6w==
-=Lvw+
------END PGP PUBLIC KEY BLOCK-----
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=tMzl
------END PGP PUBLIC KEY BLOCK-----

SPECS/compiler-rt.spec

@@ -1,79 +1,43 @@
-%bcond_with snapshot_build
+%global compiler_rt_version 15.0.7
-
+#global rc_ver 2
-%if %{with snapshot_build}
-# Unlock LLVM Snapshot LUA functions
-%{llvm_sb_verbose}
-%{llvm_sb}
-%endif
-
-# 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 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
 
-%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:		%{pkg_name}
+Name:		compiler-rt
-Version:	%{compiler_rt_version}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
+Version:	%{compiler_rt_version}%{?rc_ver:~rc%{rc_ver}}
 Release:	1%{?dist}
 Summary:	LLVM "compiler-rt" runtime libraries
 
 License:	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
-%endif
 
-Patch0:		0001-compiler-rt-Fix-FLOAT16-feature-detection.patch
+Patch0:		add-llvm-cmake-package.patch
 
 # RHEL-specific patches
 Patch100:	0001-Drop-fno-stack-protector-from-the-compiler-flags.patch
-Patch101:	0001-Fix-page-size-constant-on-aarch64-and-ppc64le.patch	
+Patch101:	fix-page-size-constant.patch
 
-BuildRequires:	clang
+BuildRequires:	gcc
+BuildRequires:	gcc-c++
 BuildRequires:	cmake
 BuildRequires:	ninja-build
 BuildRequires:	python3
-# We need python3-devel for %%py3_shebang_fix
+# We need python3-devel for pathfix.py.
 BuildRequires:	python3-devel
 BuildRequires:	llvm-devel = %{version}
-BuildRequires:	llvm-cmake-utils = %{version}
 
 # 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
@@ -85,31 +49,15 @@ instrumentation, and Blocks C language extension.
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %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
-%undefine __cmake_in_source_build
+mkdir -p %{_vpath_builddir}
+cd %{_vpath_builddir}
 
-# Copy CFLAGS into ASMFLAGS, so -fcf-protection is used when compiling assembly files.
+%cmake .. -GNinja \
-export ASMFLAGS="%{build_cflags}"
-
-# RHEL 8 specific: "global toolchain clang" is not supported on RHEL 8, so explicitly enable
-# clang in cmake. This is necessary to get the correct float16 ABI.
-%cmake	-GNinja \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-	-DCMAKE_MODULE_PATH=%{_libdir}/cmake/llvm \
+	-DLLVM_CONFIG_PATH:FILEPATH=%{_bindir}/llvm-config-%{__isa_bits} \
-	-DCMAKE_SKIP_RPATH:BOOL=ON \
-	-DCMAKE_C_COMPILER=clang \
-	-DCMAKE_CXX_COMPILER=clang++ \
-	-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 \
@@ -122,77 +70,53 @@ export ASMFLAGS="%{build_cflags}"
 
 %install
 
+cd %{_vpath_builddir}
 %cmake_install
-%ifarch ppc64le
+
-# Fix install path on ppc64le so that the directory name matches the triple used
+# move blacklist/abilist files to where clang expect them
-# by clang.
+mkdir -p %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/share
-mv %{buildroot}%{_prefix}/lib/clang/%{maj_ver}/lib/powerpc64le-redhat-linux-gnu %{buildroot}%{_prefix}/lib/clang/%{maj_ver}/lib/ppc64le-redhat-linux-gnu
+mv -v %{buildroot}%{_datadir}/*list.txt  %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/share/
-%endif
+
-%ifarch %{ix86}
+# move sanitizer libs to better place
-# Fix install path on ix86 so that the directory name matches the triple used
+%global libclang_rt_installdir lib/linux
-# by clang on both actual ix86 and on x86_64 with -m32:
+mkdir -p %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/lib
-%if "%{_target_cpu}" != "i386"
+mv -v %{buildroot}%{_prefix}/%{libclang_rt_installdir}/*clang_rt* %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/lib
-ln -s i386-redhat-linux-gnu %{buildroot}%{_prefix}/lib/clang/%{maj_ver}/lib/%{_target_cpu}-redhat-linux-gnu
+mkdir -p %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/lib/linux/
-%endif
+pushd %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/lib
+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/%{compiler_rt_version}/lib/linux
+for i in *.a *.so
+do
+	target=`echo "$i" | sed -e 's/x86_64/i386/'`
+	ln -s ../../../../../lib/clang/%{compiler_rt_version}/lib/$target ../../../../%{_lib}/clang/%{compiler_rt_version}/lib/linux/
+done
+
 %endif
 
+popd
+
 %check
+
 #%%cmake_build --target check-compiler-rt
 
 %files
 %license LICENSE.TXT
+%{_includedir}/*
+%{_libdir}/clang/%{compiler_rt_version}/lib/*
+%{_libdir}/clang/%{compiler_rt_version}/share/*
 %ifarch x86_64 aarch64
-%{_prefix}/lib/clang/%{maj_ver}/bin/*
+%{_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
-* Tue Jul 09 2024 Tom Stellard <tstellar@redhat.com> - 18.1.8-1
-- 18.1.8 Release
-
-* Fri Mar 22 2024 Tom Stellard <tstellar@redhat.com> - 18.1.2-1
-- 18.1.2 Release
-
-* 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 Nikita Popov <npopov@redhat.com> - 17.0.6-1
-- Update to LLVM 17.0.6
-
-* Fri Oct 13 2023 Nikita Popov <npopov@redhat.com> - 17.0.2-2
-- Build with clang
-
-* Wed Oct 04 2023 Nikita Popov <npopov@redhat.com> - 17.0.2-1
-- Update to LLVM 17.0.2
-
-* Fri Jun 23 2023 Tom Stellard <tstellar@redhat.com> - 16.0.6-1
-- 16.0.6 Release
-
-* Thu Apr 13 2023 Tom Stellard <tstellar@redhat.com> - 16.0.0-1
-- Update to LLVM 16.0.0
-
 * Thu Jan 19 2023 Tom Stellard <tstellar@redhat.com> - 15.0.7-1
 - Update to LLVM 15.0.7