diff --git a/SOURCES/fix-page-size-constant.patch b/SOURCES/fix-page-size-constant.patch new file mode 100644 index 0000000..2c39c3a --- /dev/null +++ b/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. diff --git a/SPECS/compiler-rt.spec b/SPECS/compiler-rt.spec index 18d2096..94aed4f 100644 --- a/SPECS/compiler-rt.spec +++ b/SPECS/compiler-rt.spec @@ -10,7 +10,7 @@ Name: compiler-rt Version: %{compiler_rt_version}%{?rc_ver:~rc%{rc_ver}} -Release: 2%{?dist} +Release: 3%{?dist} Summary: LLVM "compiler-rt" runtime libraries License: NCSA or MIT @@ -23,6 +23,7 @@ Patch0: add-llvm-cmake-package.patch # RHEL-specific patches Patch100: 0001-Drop-fno-stack-protector-from-the-compiler-flags.patch +Patch101: fix-page-size-constant.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -116,6 +117,9 @@ popd %endif %changelog +* Wed May 25 2022 Timm Bäder - 14.0.0-3 +- Fix page size constant size on aarch64 and ppc64le + * Fri Apr 29 2022 Timm Bäder - 14.0.0-2 - Remove llvm-cmake-devel BR