From b88cd84bbe1758bf061271210ddd32dd0f93b96e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 20 Oct 2020 06:14:59 +0000
Subject: [PATCH] import
 compiler-rt-11.0.0-0.1.rc2.module+el8.4.0+8195+484edabc

---
 .compiler-rt.metadata                         |   2 +-
 .gitignore                                    |   2 +-
 ...-strict-aliasing-warning-in-msan.cpp.patch |  68 -----------------
 SOURCES/compiler-rt-10.0.1.src.tar.xz.sig     | Bin 566 -> 0 bytes
 SOURCES/compiler-rt-11.0.0rc2.src.tar.xz.sig  | Bin 0 -> 566 bytes
 SPECS/compiler-rt.spec                        |  69 +++++++-----------
 6 files changed, 27 insertions(+), 114 deletions(-)
 delete mode 100644 SOURCES/0001-Fix-strict-aliasing-warning-in-msan.cpp.patch
 delete mode 100644 SOURCES/compiler-rt-10.0.1.src.tar.xz.sig
 create mode 100644 SOURCES/compiler-rt-11.0.0rc2.src.tar.xz.sig

diff --git a/.compiler-rt.metadata b/.compiler-rt.metadata
index 9720322..7476722 100644
--- a/.compiler-rt.metadata
+++ b/.compiler-rt.metadata
@@ -1,2 +1,2 @@
-ee6077b4728b3c750e476938cead11cea45b49ff SOURCES/compiler-rt-10.0.1.src.tar.xz
+cce6ae7eecfd5a7b6ca836ff1063c48eec7cae5f SOURCES/compiler-rt-11.0.0rc2.src.tar.xz
 32fa4b0193960f05064f2ab31b5a89c7cf48a0b9 SOURCES/hans-gpg-key.asc
diff --git a/.gitignore b/.gitignore
index 9107e04..92aeebd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/compiler-rt-10.0.1.src.tar.xz
+SOURCES/compiler-rt-11.0.0rc2.src.tar.xz
 SOURCES/hans-gpg-key.asc
diff --git a/SOURCES/0001-Fix-strict-aliasing-warning-in-msan.cpp.patch b/SOURCES/0001-Fix-strict-aliasing-warning-in-msan.cpp.patch
deleted file mode 100644
index b1f41e8..0000000
--- a/SOURCES/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 <sguelton@redhat.com>
-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/SOURCES/compiler-rt-10.0.1.src.tar.xz.sig b/SOURCES/compiler-rt-10.0.1.src.tar.xz.sig
deleted file mode 100644
index 98c88431187e289254f21ca8d46f8c55dbfb7803..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SEvc79j*jP9iaCzek0rjBbvi$CRmtL7j>P0$&%0kpKz_5TeJF
zsfIzFiap*B|7<*`P(f7o^G|7cC_#DbuuGP@ISoe2D>NDc4)Ka&e>wvn9MNf<(6^_L
zV`uGun@^FE61nc~MOWry0tJKF{DTBwuvs-k=!rX#$>Aq<zDy{v{fp-&918st5TM%j
z+GB~fGb&VL;dwk=s`CodvISJK*uX){dpEhZ4K<~nM-ggr)_P2q7-C0foVl5^V9e6b
zg0`=H_!f-zJ&?=*X|JCVcR+h{8+Acv0buOpS9hk=Hp5R?rmXQN!Bnp}M<*p<<K+xL
z@<hzZGEhR}C8i}_4n3rkyxPa8yupRU|2SJaTPT#*v{_-rHNt~FH2ZFuM9_qzmR9XW
zE)c`z3{DDVN_bfYTNb!VliN|o60ZkviY+jV3_-kTB;XZM78i5!>gZ4J(0!+-C3@Yh
z>ZqVsc3Oo+q4WJpjTCCx79c>wB&^dj@ekVpN(-Q19yxscuY3>cJfZn9?!JuSK&zc$
ziYvHHoiM=dz?#M*M~=6!I!tjDFkW`PPFpU91*nribKcV+wex`)Xn4mYbMb**i6bve
z9v(}@Bxj+KgD2B&262@``&IuAmks}`bX34sILF(=k}-7k#(4Bs0aumFQ$rby!(iNh
z0w|qBRYXe_$uO~?`TCMCryPdYD2!xi)pYn1XfFnht%g;{aI&T2f)O<kCdom(Ak+j(
E-@ZQxtpET3

diff --git a/SOURCES/compiler-rt-11.0.0rc2.src.tar.xz.sig b/SOURCES/compiler-rt-11.0.0rc2.src.tar.xz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..d422086a5433370bd435c8a5767e18f6cc5635a6
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SW*e79j+-$oYbTxkTfz)xuK`!vrogTF_ku0$)DMnE(n25D&uy
zE;L%uT{xi+{T-O?_w7~!4RPn1*h}ybWIa~`1}gFKXYz;3ZLgcf#!u%~JtFa#s09YY
zzi=iV1KI9XGfADDtAZtlg4jUoQac|4&xynfcLy9f`Qd1z@t~(~OwF}+7xF;|9J^y;
zH4|8){O=@%IJ;%!AFo0Cil#>nH7{*5nNY7*hU6*{hjF=;{v>~Hx`jDM6z2Kg;~4vj
zh&h9PG}USMYR`oO+#^q?ek|gOa4+7_rmRTt188QZyT>CD1FjPC_P^@$I3OgD3oi#F
zMrv5+)?ayRFp#6+I^60IwdkvGs~PooTBtX-YVG{p@^2bBSfr$1amJ|_OkW3cd4Yms
zPq^Mh>i_q?40JZyZ}@61xYcX)NUeltqT%>8Giu$#{=~T;p)2)s`cuo8@?SW((v&<<
z;j&28D{S+M^0=;mJlGw-QuhbiJ3$TIT0OzIh!5<vYKe``y2JnMCaRj}q>~j>Z-+lJ
z-0<YD{V99X>qGo@B4cAlG?h3!P!xofFR&vmkv8yd^)05d6r9rkDLS59M<*LZDn`I;
zZ}fF^e3zs8gQTy6h$qL#8S{H{<IutfrC*RBhe)!h_zWg+A>F4>3Y)8nb1?V>|0M<w
zl;2x<w%;4M-^i`Nfn5mEmW3%VA8IJq7G*na)&<%XsxfAWp>Yq<j(qf_RY-PT2L^tG
EDJW1BH~;_u

literal 0
HcmV?d00001

diff --git a/SPECS/compiler-rt.spec b/SPECS/compiler-rt.spec
index 534444c..82a6872 100644
--- a/SPECS/compiler-rt.spec
+++ b/SPECS/compiler-rt.spec
@@ -1,10 +1,6 @@
-%ifarch s390 s390x
-# only limited set of libs available on s390(x) and the existing ones (stats, ubsan) don't provide debuginfo
-%global debug_package %{nil}
-%endif
 
-#%%global rc_ver 6
-%global baserelease 1
+%global rc_ver 2
+%global baserelease 0.1
 
 %global crt_srcdir compiler-rt-%{version}%{?rc_ver:rc%{rc_ver}}.src
 
@@ -15,23 +11,17 @@
 %global optflags %(echo %{optflags} -Dasm=__asm__)
 
 Name:		compiler-rt
-Version:	10.0.1
+Version:	11.0.0
 Release:	%{baserelease}%{?rc_ver:.rc%{rc_ver}}%{?dist}
 Summary:	LLVM "compiler-rt" runtime libraries
 
 License:	NCSA or MIT
 URL:		http://llvm.org
-%if 0%{?rc_ver:1}
-Source0:	https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{crt_srcdir}.tar.xz
-Source1:	https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{crt_srcdir}.tar.xz.sig
-%else
-Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{crt_srcdir}.tar.xz
-Source3:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{crt_srcdir}.tar.xz.sig
-%endif
+Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{crt_srcdir}.tar.xz
+Source1:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{crt_srcdir}.tar.xz.sig
 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
 
 # RHEL-specific patches
 Patch100:	0001-Drop-fno-stack-protector-from-the-compiler-flags.patch
@@ -39,6 +29,7 @@ Patch100:	0001-Drop-fno-stack-protector-from-the-compiler-flags.patch
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
 BuildRequires:	cmake
+BuildRequires:	ninja-build
 BuildRequires:	python3
 # We need python3-devel for pathfix.py.
 BuildRequires:	python3-devel
@@ -59,7 +50,7 @@ pathfix.py -i %{__python3} -pn lib/hwasan/scripts/hwasan_symbolize
 %build
 mkdir -p _build
 cd _build
-%cmake .. \
+%cmake .. -GNinja \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DLLVM_CONFIG_PATH:FILEPATH=%{_bindir}/llvm-config-%{__isa_bits} \
 	\
@@ -70,11 +61,11 @@ cd _build
 %endif
 	-DCOMPILER_RT_INCLUDE_TESTS:BOOL=OFF # could be on?
 
-make %{?_smp_mflags}
+%ninja_build
 
 %install
 cd _build
-make install DESTDIR=%{buildroot}
+%ninja_install
 
 # move blacklist/abilist files to where clang expect them
 mkdir -p %{buildroot}%{_libdir}/clang/%{version}/share
@@ -90,40 +81,27 @@ for i in *.a *.so
 do
 	ln -s ../$i linux/$i
 done
-popd
 
-# multilib support: also create symlink from lib to lib64
-# fixes rhbz#1678240
-%ifarch %{ix86}
-%post
-if test "`uname -m`" = x86_64
-then
-	cd %{_libdir}/clang/%{version}/lib
-	mkdir -p ../../../../lib64/clang/%{version}/lib
-	for i in *.a *.so
-	do
-		ln -s ../../../../%{_lib}/clang/%{version}/lib/$i ../../../../lib64/clang/%{version}/lib/$i
-	done
-fi
-
-%preun
-
-if test "`uname -m`" = x86_64
-then
-	cd %{_libdir}/clang/%{version}/lib
-	for i in *.a *.so
-	do
-		rm ../../../../lib64/clang/%{version}/lib/$i
-	done
-	rmdir -p ../../../../lib64/clang/%{version}/lib 2>/dev/null 1>/dev/null || :
-fi
+# 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/%{version}/lib/linux
+for i in *.a *.so
+do
+	target=`echo "$i" | sed -e 's/x86_64/i386/'`
+	ln -s ../../../../../lib/clang/%{version}/lib/$target ../../../../%{_lib}/clang/%{version}/lib/linux/
+done
+ 
 %endif
+ 
+popd
 
 %check
 #make check-all -C _build
 
 %files
+%license LICENSE.TXT
 %{_includedir}/*
 %{_libdir}/clang/%{version}
 %ifarch x86_64 aarch64
@@ -131,6 +109,9 @@ fi
 %endif
 
 %changelog
+* Mon Sep 21 2020 sguelton@redhat.com - 11.0.0-0.1.rc2
+- 11.0.0-rc2 Release
+
 * Fri Jul 24 2020 sguelton@redhat.com - 10.0.1-1
 - 10.0.1 release