diff --git a/0001-PATCH-clang-AMD-k8-family-does-not-support-SSE4.x-wh.patch b/0001-PATCH-clang-AMD-k8-family-does-not-support-SSE4.x-wh.patch
new file mode 100644
index 0000000..38bb76a
--- /dev/null
+++ b/0001-PATCH-clang-AMD-k8-family-does-not-support-SSE4.x-wh.patch
@@ -0,0 +1,35 @@
+From 6e6453d16aed8ff6220f9933aa5c3f5832e8ff69 Mon Sep 17 00:00:00 2001
+From: serge-sans-paille <sguelton@redhat.com>
+Date: Fri, 11 Jun 2021 15:42:26 +0200
+Subject: [PATCH][clang] AMD k8 family does not support SSE4.x which are
+ required by x86-64-v2+
+
+So don't define __tune__k8__ for these micro architecture.
+
+SSE, SSE2 and SSE3 appear in https://www.amd.com/system/files/TechDocs/25112.PDF
+but not SSE4.x.
+
+Differential Revision: https://reviews.llvm.org/D104116
+
+(cherry picked from commit 092c303955cd18be6c0b923b1c0a1b96e2c91893)
+---
+ clang/lib/Basic/Targets/X86.cpp | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/clang/lib/Basic/Targets/X86.cpp b/clang/lib/Basic/Targets/X86.cpp
+index 694a809..80e160b 100644
+--- a/clang/lib/Basic/Targets/X86.cpp
++++ b/clang/lib/Basic/Targets/X86.cpp
+@@ -513,9 +513,6 @@ void X86TargetInfo::getTargetDefines(const LangOptions &Opts,
+   case CK_K8:
+   case CK_K8SSE3:
+   case CK_x86_64:
+-  case CK_x86_64_v2:
+-  case CK_x86_64_v3:
+-  case CK_x86_64_v4:
+     defineCPUMacros(Builder, "k8");
+     break;
+   case CK_AMDFAM10:
+-- 
+1.8.3.1
+
diff --git a/clang.spec b/clang.spec
index 2a2e83b..6c67f10 100644
--- a/clang.spec
+++ b/clang.spec
@@ -78,7 +78,7 @@
 
 Name:		%pkg_name
 Version:	%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A C language family front-end for LLVM
 
 License:	NCSA
@@ -102,6 +102,7 @@ Patch2:     0003-PATCH-clang-Don-t-install-static-libraries.patch
 Patch3:     0004-PATCH-clang-Prefer-gcc-toolchains-with-libgcc_s.so-w.patch
 Patch4:     0005-PATCH-clang-Partially-Revert-scan-view-Remove-Report.patch
 Patch5:     0006-PATCH-clang-Allow-__ieee128-as-an-alias-to-__float12.patch
+Patch6:     0001-PATCH-clang-AMD-k8-family-does-not-support-SSE4.x-wh.patch
 
 # Patches for clang-tools-extra
 %if !0%{?compat_build}
@@ -588,6 +589,9 @@ false
 
 %endif
 %changelog
+* Mon Jun 14 2021 sguelton@redhat.com - 12.0.0-5
+- Backport
+
 * Tue Jun 08 2021 Tom Stellard <tstellar@redhat.com> - 12.0.0-4
 - Only enable -funwind-tables by default on Fedora arches