diff --git a/0001-Fix-page-size-constant-on-aarch64-and-ppc64le.patch b/0001-Fix-page-size-constant-on-aarch64-and-ppc64le.patch new file mode 100644 index 0000000000000000000000000000000000000000..925c9966242f8f99fdf18dd5c668128fc0e4469c --- /dev/null +++ b/0001-Fix-page-size-constant-on-aarch64-and-ppc64le.patch @@ -0,0 +1,25 @@ +From 5f73befe5a0df82e455f4b1052e62f34009e98bb Mon Sep 17 00:00:00 2001 +From: Tom Stellard +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 + diff --git a/compiler-rt.spec b/compiler-rt.spec index 5559dc3d880af802c13ce04cb3848cd93f49d518..394c59e4fcfbf20a1ea69848c3f911af9427a1b0 100644 --- a/compiler-rt.spec +++ b/compiler-rt.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 %bcond_with snapshot_build %if %{with snapshot_build} @@ -11,9 +10,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 8 #global rc_ver 4 %if %{with snapshot_build} %global maj_ver %{llvm_snapshot_version_major} @@ -25,20 +26,25 @@ %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%{anolis_release}%{?dist} +Release: 1%{?dist} Summary: LLVM "compiler-rt" runtime libraries License: NCSA or MIT URL: http://llvm.org -ExcludeArch: loongarch64 %if %{with snapshot_build} Source0: %{llvm_snapshot_source_prefix}compiler-rt-%{llvm_snapshot_yyyymmdd}.src.tar.xz %{llvm_snapshot_extra_source_tags} @@ -52,7 +58,7 @@ Patch0: 0001-compiler-rt-Fix-FLOAT16-feature-detection.patch # RHEL-specific patches Patch100: 0001-Drop-fno-stack-protector-from-the-compiler-flags.patch -Patch101: fix-page-size-constant.patch +Patch101: 0001-Fix-page-size-constant-on-aarch64-and-ppc64le.patch BuildRequires: clang BuildRequires: cmake @@ -67,6 +73,7 @@ BuildRequires: llvm-cmake-utils = %{version} 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 @@ -121,6 +128,13 @@ export ASMFLAGS="%{build_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 @@ -138,8 +152,31 @@ mv %{buildroot}%{_prefix}/lib/clang/%{maj_ver}/lib/powerpc64le-redhat-linux-gnu #%endif %changelog -* Mon Sep 23 2024 Bo Ren - 17.0.6-1.0.1 -- Exclude loongarch64 +* Tue Jul 09 2024 Tom Stellard - 18.1.8-1 +- 18.1.8 Release + +* Fri Mar 22 2024 Tom Stellard - 18.1.2-1 +- 18.1.2 Release + +* Tue Mar 12 2024 Tom Stellard - 18.1.1-1 +- 18.1.1 Release + +* Wed Feb 28 2024 Tom Stellard - 18.1.0~rc4-1 +- 18.1.0-rc4 Release + +* Wed Jan 24 2024 Fedora Release Engineering - 17.0.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 17.0.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +%{?llvm_snapshot_changelog_entry} + +* Mon Dec 18 2023 Jeremy Newton - 17.0.6-3 +- Add compiler-rt(major) provides + +* Wed Dec 13 2023 Miro Hrončok - 17.0.6-2 +- Fix install path on i686 * Wed Nov 29 2023 Nikita Popov - 17.0.6-1 - Update to LLVM 17.0.6 diff --git a/download b/download index c43820b434b6aecfa2eb2fe3a22708ffa6638ad2..610ac7c873d2b085b78817239fe7380d56709701 100644 --- a/download +++ b/download @@ -1,2 +1,2 @@ -85d25f04cbc4c1a20e3a1ab2a2c522cd compiler-rt-17.0.6.src.tar.xz -b685a44ac1e4e7938775975fec0db835 compiler-rt-17.0.6.src.tar.xz.sig +63bdea64f3af91ff38b3ee1b6f416d0b compiler-rt-18.1.8.src.tar.xz +d12c1ac0ceab87ed113b879715d9e613 compiler-rt-18.1.8.src.tar.xz.sig diff --git a/fix-page-size-constant.patch b/fix-page-size-constant.patch deleted file mode 100644 index 2c39c3a71551372eef7db38a4bd682ddbf9e010e..0000000000000000000000000000000000000000 --- a/fix-page-size-constant.patch +++ /dev/null @@ -1,15 +0,0 @@ -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.