diff --git a/compiler-rt.spec b/compiler-rt.spec
index 78a8e91..df1b0e9 100644
--- a/compiler-rt.spec
+++ b/compiler-rt.spec
@@ -10,7 +10,7 @@
 
 Name:		compiler-rt
 Version:	%{compiler_rt_version}%{?rc_ver:~rc%{rc_ver}}
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	LLVM "compiler-rt" runtime libraries
 
 License:	NCSA or MIT
@@ -20,6 +20,7 @@ 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++
@@ -110,6 +111,9 @@ popd
 %endif
 
 %changelog
+* Thu May 12 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.0-2
+- Disable execstack on s390x
+
 * Mon Apr 25 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.0-1
 - 14.0.0 Release
 
diff --git a/fix-s390x-execstack.patch b/fix-s390x-execstack.patch
new file mode 100644
index 0000000..6f46747
--- /dev/null
+++ b/fix-s390x-execstack.patch
@@ -0,0 +1,9 @@
+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