From c8e0bc36d47e00b040a9c7fa3268c4020226e37e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timm=20B=C3=A4der?= <tbaeder@redhat.com>
Date: Wed, 22 Jun 2022 12:59:37 +0200
Subject: [PATCH] Update to 14.0.5

Resolves: rhbz#2061056
---
 .gitignore                | 2 ++
 compiler-rt.spec          | 8 +++++---
 fix-s390x-execstack.patch | 9 ---------
 sources                   | 4 ++--
 4 files changed, 9 insertions(+), 14 deletions(-)
 delete mode 100644 fix-s390x-execstack.patch

diff --git a/.gitignore b/.gitignore
index 45a9650..467f74c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,3 +83,5 @@
 /compiler-rt-13.0.1.src.tar.xz.sig
 /compiler-rt-14.0.0.src.tar.xz
 /compiler-rt-14.0.0.src.tar.xz.sig
+/compiler-rt-14.0.5.src.tar.xz
+/compiler-rt-14.0.5.src.tar.xz.sig
diff --git a/compiler-rt.spec b/compiler-rt.spec
index df1b0e9..5dc8b62 100644
--- a/compiler-rt.spec
+++ b/compiler-rt.spec
@@ -1,4 +1,4 @@
-%global compiler_rt_version 14.0.0
+%global compiler_rt_version 14.0.5
 #global rc_ver 2
 %global crt_srcdir compiler-rt-%{compiler_rt_version}%{?rc_ver:rc%{rc_ver}}.src
 
@@ -10,7 +10,7 @@
 
 Name:		compiler-rt
 Version:	%{compiler_rt_version}%{?rc_ver:~rc%{rc_ver}}
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	LLVM "compiler-rt" runtime libraries
 
 License:	NCSA or MIT
@@ -20,7 +20,6 @@ Source1:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compil
 Source2:	tstellar-gpg-key.asc
 
 Patch0:		add-llvm-cmake-package.patch
-Patch1:		fix-s390x-execstack.patch
 
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
@@ -111,6 +110,9 @@ popd
 %endif
 
 %changelog
+* Wed Jun 22 2022 Timm Bäeder <tbaeder@redhat.com> - 14.0.5-1
+- 14.0.5 Release
+
 * Thu May 12 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.0-2
 - Disable execstack on s390x
 
diff --git a/fix-s390x-execstack.patch b/fix-s390x-execstack.patch
deleted file mode 100644
index 6f46747..0000000
--- a/fix-s390x-execstack.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -ruN compiler-rt-14.0.0.src.orig/lib/tsan/rtl/tsan_rtl_s390x.S compiler-rt-14.0.0.src/lib/tsan/rtl/tsan_rtl_s390x.S
---- a/compiler-rt-14.0.0.src.orig/lib/tsan/rtl/tsan_rtl_s390x.S	2022-03-14 10:44:55.000000000 +0100
-+++ b/compiler-rt-14.0.0.src/lib/tsan/rtl/tsan_rtl_s390x.S	2022-05-12 10:26:37.997964313 +0200
-@@ -45,3 +45,5 @@
- intercept _setjmp, _ZN14__interception12real__setjmpE
- intercept sigsetjmp, _ZN14__interception14real_sigsetjmpE
- intercept __sigsetjmp, _ZN14__interception16real___sigsetjmpE
-+
-+NO_EXEC_STACK_DIRECTIVE
diff --git a/sources b/sources
index 1c61541..90b2cb6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (compiler-rt-14.0.0.src.tar.xz) = 9df73ef3b81f2b70902726e0dc5529c0cc1e976ce75fbfb1c3d7930882d82fc0896934a32d1c9511b08962cac5b409c14f54dc53833fbf0724256b22165c4439
-SHA512 (compiler-rt-14.0.0.src.tar.xz.sig) = 3998c7a7477a95ae36591b8658677a44f5d4c88a57e93df57fc3f4670c38a71fb0e385b7f9b44ef7e97d7ce77551b4ea790c6f63174e79a2ffc9dd678dcf886f
+SHA512 (compiler-rt-14.0.5.src.tar.xz) = e63792751013e144cec56f8e5f90ebf9cdf16a4dfac39bf21e12b2c3bfb83204fe4c470f9c45e03cebfe2c6b25d7f1e1dc7c93e736d17f678011f5e5321e9d40
+SHA512 (compiler-rt-14.0.5.src.tar.xz.sig) = 0c8cd60736d69fc2217fc08e823f07cbe1ff73a391b40b1ce1b77a6f9cf123f50a66ab13c213d3a381affaa272392de6cce8bbb3a0268824e2617b5b91dca36c