diff --git a/llvm-fix-building-with-GCC-12.patch b/llvm-fix-building-with-GCC-12.patch
new file mode 100644
index 0000000..38f734b
--- /dev/null
+++ b/llvm-fix-building-with-GCC-12.patch
@@ -0,0 +1,28 @@
+From c5029023fb076f72a3e5bf26085642bcd1fa22fb Mon Sep 17 00:00:00 2001
+From: Martin Liska <mliska@suse.cz>
+Date: Tue, 2 Nov 2021 09:34:09 +0100
+Subject: [PATCH] Fix building with GCC 12:
+
+Fixes: https://bugs.llvm.org/show_bug.cgi?id=52380
+
+Differential Revision: https://reviews.llvm.org/D112990
+---
+ llvm/lib/Target/AMDGPU/SILoadStoreOptimizer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/llvm/lib/Target/AMDGPU/SILoadStoreOptimizer.cpp b/llvm/lib/Target/AMDGPU/SILoadStoreOptimizer.cpp
+index 58415ecc9432..1f5312e5cb14 100644
+--- a/llvm/lib/Target/AMDGPU/SILoadStoreOptimizer.cpp
++++ b/llvm/lib/Target/AMDGPU/SILoadStoreOptimizer.cpp
+@@ -2065,7 +2065,7 @@ SILoadStoreOptimizer::collectMergeableInsts(
+     // adjacent to each other in the list, which will make it easier to find
+     // matches.
+     MergeList.sort(
+-        [] (const CombineInfo &A, CombineInfo &B) {
++        [] (const CombineInfo &A, const CombineInfo &B) {
+           return A.Offset < B.Offset;
+         });
+     ++I;
+-- 
+2.33.1
+
diff --git a/llvm13.changes b/llvm13.changes
index 2478212..18ec839 100644
--- a/llvm13.changes
+++ b/llvm13.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Nov  2 21:18:57 UTC 2021 - Aaron Puchert <aaronpuchert@alice-dsl.net>
+
+- Let clang recommend gcc and glibc-devel as we need both for
+  building executables. No hard requirement because Clang can be
+  used as a frontend only. (boo#1191587)
+- Set minimal CMake version required.
+
+-------------------------------------------------------------------
+Tue Nov  2 13:30:06 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Backport llvm-fix-building-with-GCC-12.patch in order to fix building
+  with GCC 12.
+
 -------------------------------------------------------------------
 Sat Oct  2 20:13:04 UTC 2021 - Aaron Puchert <aaronpuchert@alice-dsl.net>
 
diff --git a/llvm13.spec b/llvm13.spec
index c808bee..619a22f 100644
--- a/llvm13.spec
+++ b/llvm13.spec
@@ -137,8 +137,9 @@ Patch26:        lld-default-sha1.patch
 Patch27:        llvm-exegesis-link-dylib.patch
 # Fix lookup of targets in installed CMake files. (boo#1180748, https://reviews.llvm.org/D96670)
 Patch33:        CMake-Look-up-target-subcomponents-in-LLVM_AVAILABLE_LIBS.patch
+Patch34:        llvm-fix-building-with-GCC-12.patch
 BuildRequires:  binutils-devel >= 2.21.90
-BuildRequires:  cmake
+BuildRequires:  cmake >= 3.13.4
 BuildRequires:  fdupes
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -239,6 +240,8 @@ Requires(post): update-alternatives
 Requires(postun):update-alternatives
 Recommends:     clang%{_sonum}-doc
 Recommends:     clang-tools
+Recommends:     gcc
+Recommends:     glibc-devel
 Recommends:     libstdc++-devel
 Suggests:       libc++-devel
 
@@ -561,6 +564,7 @@ This package contains the development files for Polly.
 %patch24 -p1
 %patch27 -p2
 %patch33 -p2
+%patch34 -p2
 
 pushd clang-%{_version}.src
 %patch2 -p1