diff --git a/.gitignore b/.gitignore index fefea7d..11998c7 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,5 @@ /compiler-rt-10.0.0rc6.src.tar.xz.sig /compiler-rt-10.0.0.src.tar.xz /compiler-rt-10.0.0.src.tar.xz.sig +/compiler-rt-11.0.0rc1.src.tar.xz +/compiler-rt-11.0.0rc1.src.tar.xz.sig diff --git a/0001-Fix-strict-aliasing-warning-in-msan.cpp.patch b/0001-Fix-strict-aliasing-warning-in-msan.cpp.patch deleted file mode 100644 index b1f41e8..0000000 --- a/0001-Fix-strict-aliasing-warning-in-msan.cpp.patch +++ /dev/null @@ -1,68 +0,0 @@ -From af38074874c605f9e598ae3f7e5d4befa3fe92bb Mon Sep 17 00:00:00 2001 -From: serge-sans-paille -Date: Thu, 28 May 2020 17:50:31 +0200 -Subject: [PATCH] Fix strict aliasing warning in msan.cpp - -Use internal_memcpy instead. - -Differential Revision: https://reviews.llvm.org/D80732 ---- - compiler-rt/lib/msan/msan.cpp | 21 ++++++++++++++------- - 1 file changed, 14 insertions(+), 7 deletions(-) - -diff --git compiler-rt.orig/lib/msan/msan.cpp compiler-rt/lib/msan/msan.cpp -index 7095ee1bf20..8c789901adc 100644 ---- compiler-rt.orig/lib/msan/msan.cpp -+++ compiler-rt/lib/msan/msan.cpp -@@ -617,34 +617,41 @@ u32 __msan_get_umr_origin() { - } - - u16 __sanitizer_unaligned_load16(const uu16 *p) { -- *(uu16 *)&__msan_retval_tls[0] = *(uu16 *)MEM_TO_SHADOW((uptr)p); -+ internal_memcpy(&__msan_retval_tls[0], (void *)MEM_TO_SHADOW((uptr)p), -+ sizeof(uu16)); - if (__msan_get_track_origins()) - __msan_retval_origin_tls = GetOriginIfPoisoned((uptr)p, sizeof(*p)); - return *p; - } - u32 __sanitizer_unaligned_load32(const uu32 *p) { -- *(uu32 *)&__msan_retval_tls[0] = *(uu32 *)MEM_TO_SHADOW((uptr)p); -+ internal_memcpy(&__msan_retval_tls[0], (void *)MEM_TO_SHADOW((uptr)p), -+ sizeof(uu32)); - if (__msan_get_track_origins()) - __msan_retval_origin_tls = GetOriginIfPoisoned((uptr)p, sizeof(*p)); - return *p; - } - u64 __sanitizer_unaligned_load64(const uu64 *p) { -- __msan_retval_tls[0] = *(uu64 *)MEM_TO_SHADOW((uptr)p); -+ internal_memcpy(&__msan_retval_tls[0], (void *)MEM_TO_SHADOW((uptr)p), -+ sizeof(uu64)); - if (__msan_get_track_origins()) - __msan_retval_origin_tls = GetOriginIfPoisoned((uptr)p, sizeof(*p)); - return *p; - } - void __sanitizer_unaligned_store16(uu16 *p, u16 x) { -- u16 s = *(uu16 *)&__msan_param_tls[1]; -- *(uu16 *)MEM_TO_SHADOW((uptr)p) = s; -+ static_assert(sizeof(uu16) == sizeof(u16), "incompatible types"); -+ u16 s; -+ internal_memcpy(&s, &__msan_param_tls[1], sizeof(uu16)); -+ internal_memcpy((void *)MEM_TO_SHADOW((uptr)p), &s, sizeof(uu16)); - if (s && __msan_get_track_origins()) - if (uu32 o = __msan_param_origin_tls[2]) - SetOriginIfPoisoned((uptr)p, (uptr)&s, sizeof(s), o); - *p = x; - } - void __sanitizer_unaligned_store32(uu32 *p, u32 x) { -- u32 s = *(uu32 *)&__msan_param_tls[1]; -- *(uu32 *)MEM_TO_SHADOW((uptr)p) = s; -+ static_assert(sizeof(uu32) == sizeof(u32), "incompatible types"); -+ u32 s; -+ internal_memcpy(&s, &__msan_param_tls[1], sizeof(uu32)); -+ internal_memcpy((void *)MEM_TO_SHADOW((uptr)p), &s, sizeof(uu32)); - if (s && __msan_get_track_origins()) - if (uu32 o = __msan_param_origin_tls[2]) - SetOriginIfPoisoned((uptr)p, (uptr)&s, sizeof(s), o); --- -2.25.2 - diff --git a/compiler-rt.spec b/compiler-rt.spec index 91c2a0c..12ab178 100644 --- a/compiler-rt.spec +++ b/compiler-rt.spec @@ -1,6 +1,6 @@ -#%%global rc_ver 6 -%global baserelease 9 +%global rc_ver 1 +%global baserelease 0.1 %global crt_srcdir compiler-rt-%{version}%{?rc_ver:rc%{rc_ver}}.src @@ -11,7 +11,7 @@ %global optflags %(echo %{optflags} -Dasm=__asm__) Name: compiler-rt -Version: 10.0.0 +Version: 11.0.0 Release: %{baserelease}%{?rc_ver:.rc%{rc_ver}}%{?dist} Summary: LLVM "compiler-rt" runtime libraries @@ -27,7 +27,6 @@ Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{versio Source2: https://prereleases.llvm.org/%{version}/hans-gpg-key.asc Patch0: 0001-PATCH-std-thread-copy.patch -Patch1: 0001-Fix-strict-aliasing-warning-in-msan.cpp.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -114,6 +113,9 @@ popd %endif %changelog +* Mon Aug 10 2020 Tom Stellard - 11.0.0-0.1.rc1 +- 11.0.0-rc1 Release + * Wed Jul 29 2020 sguelton@redhat.com - 10.0.0-9 - use %%license macro diff --git a/sources b/sources index e9f85b5..5537d3b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (compiler-rt-10.0.0.src.tar.xz) = c4a25d1e922a051c78255aec9fd525acbbcaa62cc53161ed6979b21a0d91301d3c2c07ca1b6460f1c4d6656c29373ff0c20d5496955ed0a0b26d7eebbf159ec4 -SHA512 (compiler-rt-10.0.0.src.tar.xz.sig) = 650c1428399e26772b2e5200f69fce6d800bd4a023e3daa0d177b7ddf58d9749fac3ae6423bce43834966f0049194b9eaf120b604dd2b1ac0c089608df7b5cba +SHA512 (compiler-rt-11.0.0rc1.src.tar.xz) = 132a0b78f5c97d367aadade40777ca0053e3d6bdea2f6863a165a013258158bcfc0bd674562194f485998e82d14228ec96a572ef6849e4d4fa785101e8ce6ebf +SHA512 (compiler-rt-11.0.0rc1.src.tar.xz.sig) = e694c2eab749706fdf8461b3195b5a4266a140195e852fbf35943022904f6ee5c7f5155f642be3c7db07cc13aca82b0f85cad2cc93f48d5afe30e8fd01562e36