From fe1ee1ca192e4067e2b6f5ebc6cd34b42e1dfd66 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 30 Mar 2021 13:46:00 -0400
Subject: [PATCH] import compiler-rt-11.0.0-1.module+el8.4.0+8598+a071fcd5

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

diff --git a/.compiler-rt.metadata b/.compiler-rt.metadata
index df53cce..2d5b128 100644
--- a/.compiler-rt.metadata
+++ b/.compiler-rt.metadata
@@ -1,2 +1,2 @@
-4744490da9c1186ba7f730d8a8f4fa4b0d4ee0bc SOURCES/compiler-rt-10.0.0.src.tar.xz
+be3e79fb93cd99135643a191f27c49449bf9c0ee SOURCES/compiler-rt-11.0.0.src.tar.xz
 32fa4b0193960f05064f2ab31b5a89c7cf48a0b9 SOURCES/hans-gpg-key.asc
diff --git a/.gitignore b/.gitignore
index bb7c9af..df8205a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/compiler-rt-10.0.0.src.tar.xz
+SOURCES/compiler-rt-11.0.0.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.0.src.tar.xz.sig b/SOURCES/compiler-rt-10.0.0.src.tar.xz.sig
deleted file mode 100644
index 883eb04e00b5b007beacf6a60f393d002815f383..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SW*e79j+-$oYbTxkTfz)xuK`!vrogTF_ku0$zFilK=_{5D&uy
zE;L%uUAeIj{xxvkXN>b;tD*Kf0?KPRKQkXxz-KODuj~yYv^VNDI~TZHeFd@+Z3Ah)
z)Z#rdOKc@`Gr3f+MQzG2Rl@mioma`}u^^&v2XTvO4nUczZ(o#@7P66D|0s#)f9*%K
z{Hh@w<%Abt%B+slhR;0ge<tNHYGQkT-DSyy#Oc~~gY)SZAC9NGmwP2T8H`e{qGNR<
z7UzXa>X&fkxpgHT3aI|5I(k%<+j=`n3JPNT&oM}mL~Ni19V8BuT3}z<bFSx?qRZo`
z{R0p`zJb=SIL_i&LwdqYJzZ{8IUOAy>m&0-Z96a;G-g)JBkw;|AENBx_{o9t_23xW
zOd=i8g~Qi5Us{E8YDZ?AT2%^F&tXW{Ba@k`yXX6)T4X602$;261x_QBNt`+F6oM<N
zor$vA+4`^bd{8`<mwBSIg5`TNe^sjE9tHef^dqLik``D)YCYT|xW;>>n<HS)YaPtP
zgY|xAXboMbFcjes+v-slry4b_!!0<P9L|bp-d`zJ8K(NJ4GIHC6yFI3o+Q{HWVUu4
z0ZFgYJK|GzY6s5DS|A#p_fRDByN3NlS<belvw0x#_L0&CXZS9Pct=6Ph~f^+{oMcS
zn8(8q;w^aaa*W_Xs;C2;$w@3Skg2tf;m1+)YP(?B)x`xw3PsiIVUD5TH`D16hq!PH
E`FcVRhX4Qo

diff --git a/SOURCES/compiler-rt-11.0.0.src.tar.xz.sig b/SOURCES/compiler-rt-11.0.0.src.tar.xz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..9889fc6bba904df23249115aa57edbef7531c92c
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SW*e79j+-$oYbTxkTfz)xuK`!vrogTF_ku0$+p^3;+rV5D&uy
zE;L%uUHJqL{xSxIrh^&Gr$86Ut4?_3UqX?e-@P)UxLYS`1+nMNm!1~Vs$%xqIE9UG
zPn$-SP>Vz-kH4#&=dgx8kzhjBt!!ztyQ~7WG;yO9L*fcRobz>fU>~eVC9fWYY3J&i
zL+4BvK3V8{ti7p{gC9zwQBUnn(=U&iBMs?$M&CPoV&de&(#NguLEztSTfSni$J8sg
z?&-*xoYfLkTUMfQRaegMLtelzh<q3W4RXh{-FeEusxSXi3}kNgVs`MV$ULuaEK*Yo
z*ubTo-S<AYfxiGmU}<|GIK08+aNoL1rvBH#?tjQ|2WYlV>c=4@9jOdAOS5Zrkp;<*
zn}N<Qbmmj(7Y;RQ{_yntQMIra?fO8bT_W%%>{QiFx|IRR58%2KBj}7MZNIN=)9Gmr
zF|w2!xlAqx4}M*|i$56Pmx<(p<r&?0-U+m8+N(eq6PAh}AyN1fWpv&8Vod-fN6_n8
z&ldR+-=MrOafoT0r8Uio(>`vmix%7Yg$PL1L9$Eg5Rp#EkHJ}fvet?9DJQVZgydEs
zle+g*A+j{z-&MXFFjZtr32`O^`U)Ee!{;>R<c(BsdDjp`GKGbDa2o|sS>lfkwenW>
zE{5{v@`i~sUq*~zUSa`%S=dXBuG!B><RQEm%75gf&GA-U=1mau_j;ZM3(zeP36Dj=
EPN4=AjsO4v

literal 0
HcmV?d00001

diff --git a/SPECS/compiler-rt.spec b/SPECS/compiler-rt.spec
index a2b5ed2..0d36a83 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 2
+%global baserelease 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.0
+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,15 @@ fi
 %endif
 
 %changelog
+* Thu Oct 29 2020 sguelton@redhat.com - 11.0.0-1
+- 11.0.0 final release
+
+* 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
+
 * Mon Jun 15 2020 sguelton@redhat.com - 10.0.0-2
 - Fix msan compilation warnings, see rhbz#1841165