remove patch

3 files changed, 1 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8c3936418eae..0806c510cafc 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -49,8 +49,6 @@ pkgbase = lib32-mesa-minimal+-git
 	source = mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git
 	source = LICENSE
 	source = llvm32.native
-	source = 0002-fix-ac_build_atomic_rmw-with-LLVM-13.patch
-	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
diff --git a/0002-fix-ac_build_atomic_rmw-with-LLVM-13.patch b/0002-fix-ac_build_atomic_rmw-with-LLVM-13.patch
deleted file mode 100755
index 2bebd52e8721..000000000000
--- a/0002-fix-ac_build_atomic_rmw-with-LLVM-13.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 5903405880c81dfffa9391d3df7e133da3160934 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
-Date: Tue, 2 Mar 2021 02:59:23 -0500
-Subject: [PATCH] ac/llvm: fix ac_build_atomic_rmw with LLVM 13
-
----
- src/amd/llvm/ac_llvm_helper.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/amd/llvm/ac_llvm_helper.cpp b/src/amd/llvm/ac_llvm_helper.cpp
-index ebeafaea553..0ab9517f431 100644
---- a/src/amd/llvm/ac_llvm_helper.cpp
-+++ b/src/amd/llvm/ac_llvm_helper.cpp
-@@ -321,6 +321,9 @@ LLVMValueRef ac_build_atomic_rmw(struct ac_llvm_context *ctx, LLVMAtomicRMWBinOp
-    unsigned SSID = llvm::unwrap(ctx->context)->getOrInsertSyncScopeID(sync_scope);
-    return llvm::wrap(llvm::unwrap(ctx->builder)
-                         ->CreateAtomicRMW(binop, llvm::unwrap(ptr), llvm::unwrap(val),
-+#if LLVM_VERSION_MAJOR >= 13
-+                                          llvm::MaybeAlign(0),
-+#endif
-                                           llvm::AtomicOrdering::SequentiallyConsistent, SSID));
- }
- 
-@@ -331,6 +334,9 @@ LLVMValueRef ac_build_atomic_cmp_xchg(struct ac_llvm_context *ctx, LLVMValueRef
-    return llvm::wrap(llvm::unwrap(ctx->builder)
-                         ->CreateAtomicCmpXchg(llvm::unwrap(ptr), llvm::unwrap(cmp),
-                                               llvm::unwrap(val),
-+#if LLVM_VERSION_MAJOR >= 13
-+                                              llvm::MaybeAlign(0),
-+#endif
-                                               llvm::AtomicOrdering::SequentiallyConsistent,
-                                               llvm::AtomicOrdering::SequentiallyConsistent, SSID));
- }
--- 
-GitLab
-
diff --git a/PKGBUILD b/PKGBUILD
index 9787e0b375c0..04a1805ad34b 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -27,11 +27,9 @@ url="https://www.mesa3d.org"
 license=('custom')
 source=('mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git'
         'LICENSE'
-        'llvm32.native'
-        '0002-fix-ac_build_atomic_rmw-with-LLVM-13.patch')
+        'llvm32.native')
 sha512sums=('SKIP'
             'SKIP'
-            'SKIP'
             'SKIP')
 
 # NINJAFLAGS is an env var used to pass commandline options to ninja