From f0eda5fb2bad33b89e331c117e80c6e681606df9 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 21 Jan 2020 18:44:06 -0500
Subject: [PATCH] import compiler-rt-9.0.0-1.module+el8.2.0+4344+da5775f3

---
 .compiler-rt.metadata  |  2 +-
 .gitignore             |  2 +-
 SPECS/compiler-rt.spec | 57 +++++++++++++++++++++++++++++++++++++-----
 3 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/.compiler-rt.metadata b/.compiler-rt.metadata
index 4a3887e..829e254 100644
--- a/.compiler-rt.metadata
+++ b/.compiler-rt.metadata
@@ -1 +1 @@
-5af387779120bb2a9fad5d6fff1a3d6f4fa6c352 SOURCES/compiler-rt-8.0.0.src.tar.xz
+4e00cb231ff87fd4f970f35b2da86185a612e0e2 SOURCES/compiler-rt-9.0.0.src.tar.xz
diff --git a/.gitignore b/.gitignore
index c27093d..8bcaaa3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/compiler-rt-8.0.0.src.tar.xz
+SOURCES/compiler-rt-9.0.0.src.tar.xz
diff --git a/SPECS/compiler-rt.spec b/SPECS/compiler-rt.spec
index 9cbb545..3a895c4 100644
--- a/SPECS/compiler-rt.spec
+++ b/SPECS/compiler-rt.spec
@@ -3,13 +3,14 @@
 %global debug_package %{nil}
 %endif
 
-#%%global rc_ver 4
+#%%global rc_ver 3
+%global baserelease 1
 
 %global crt_srcdir compiler-rt-%{version}%{?rc_ver:rc%{rc_ver}}.src
 
 Name:		compiler-rt
-Version:	8.0.0
-Release:	1%{?rc_ver:.rc%{rc_ver}}%{?dist}
+Version:	9.0.0
+Release:	%{baserelease}%{?rc_ver:.rc%{rc_ver}}%{?dist}
 Summary:	LLVM "compiler-rt" runtime libraries
 
 License:	NCSA or MIT
@@ -17,7 +18,9 @@ URL:		http://llvm.org
 Source0:	http://%{?rc_ver:pre}releases.llvm.org/%{version}/%{?rc_ver:rc%{rc_ver}}/%{crt_srcdir}.tar.xz
 
 Patch0:		0001-PATCH-std-thread-copy.patch
-Patch1:		0001-Drop-fno-stack-protector-from-the-compiler-flags.patch
+
+# RHEL-specific patches
+Patch100:	0001-Drop-fno-stack-protector-from-the-compiler-flags.patch
 
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
@@ -71,12 +74,42 @@ done
 
 # move sanitizer libs to better place
 %global libclang_rt_installdir lib/linux
-mv -v %{buildroot}%{_prefix}/%{libclang_rt_installdir}/libclang_rt* %{buildroot}%{_libdir}/clang/%{version}/lib
+mv -v %{buildroot}%{_prefix}/%{libclang_rt_installdir}/*clang_rt* %{buildroot}%{_libdir}/clang/%{version}/lib
 mkdir -p %{buildroot}%{_libdir}/clang/%{version}/lib/linux/
 pushd %{buildroot}%{_libdir}/clang/%{version}/lib
-for i in *.a *.syms *.so; do
+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
+
+%endif
 
 %check
 #make check-all -C _build
@@ -86,6 +119,18 @@ done
 %{_libdir}/clang/%{version}
 
 %changelog
+* Fri Sep 27 2019 Tom Stellard <tstellar@redhat.com> - 9.0.0-1
+- 9.0.0 Release
+
+* Thu Aug 1 2019 sguelton@redhat.com - 8.0.1-1
+- 8.0.1 release
+
+* Thu Jul 4 2019 sguelton@redhat.com - 8.0.1-0.2.rc2
+- Fix rhbz#1678240
+
+* Thu Jun 13 2019 sguelton@redhat.com - 8.0.1-0.1.rc2
+- 8.0.1rc2 Release
+
 * Wed Apr 17 2019 sguelton@redhat.com - 8.0.0-1
 - 8.0.0 Release