From a14089fc999ab23b3a5827f70f72cc0e8d1fdd36 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Fri, 11 Feb 2022 01:41:12 +0100
Subject: [PATCH] Add valgrind-3.18.1-arm64-atomics-rdm.patch

Resolves: #2052560
valgrind: Dubious requirement for joint Atomics/RDM support on aarch64
---
 valgrind-3.18.1-arm64-atomics-rdm.patch | 16 ++++++++++++++++
 valgrind.spec                           |  9 ++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 valgrind-3.18.1-arm64-atomics-rdm.patch

diff --git a/valgrind-3.18.1-arm64-atomics-rdm.patch b/valgrind-3.18.1-arm64-atomics-rdm.patch
new file mode 100644
index 0000000..47cb91a
--- /dev/null
+++ b/valgrind-3.18.1-arm64-atomics-rdm.patch
@@ -0,0 +1,16 @@
+diff --git a/VEX/priv/main_main.c b/VEX/priv/main_main.c
+index 1253cf588..482047c7a 100644
+--- a/VEX/priv/main_main.c
++++ b/VEX/priv/main_main.c
+@@ -2163,11 +2163,6 @@ static void check_hwcaps ( VexArch arch, UInt hwcaps )
+          if (have_fp16 != have_vfp16)
+             invalid_hwcaps(arch, hwcaps,
+                     "Mismatch detected between scalar and vector FP16 features.\n");
+-         Bool have_rdm = ((hwcaps & VEX_HWCAPS_ARM64_RDM) != 0);
+-         Bool have_atomics = ((hwcaps & VEX_HWCAPS_ARM64_ATOMICS) != 0);
+-         if (have_rdm != have_atomics)
+-            invalid_hwcaps(arch, hwcaps,
+-                    "Mismatch detected between RDMA and atomics features.\n");
+          return;
+       }
+ 
diff --git a/valgrind.spec b/valgrind.spec
index 1314c5b..c420690 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -3,7 +3,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: %{?scl_prefix}valgrind
 Version: 3.18.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.valgrind.org/
@@ -140,6 +140,9 @@ Patch21: valgrind-3.18.1-ppc-hwcaps.patch
 # KDE#447991 s390x: Valgrind indicates illegal instruction on wflrx
 Patch22: valgrind-3.18.1-s390x-wflrx.patch
 
+# KDE#449494 arm64: Mismatch detected between RDMA and atomics features
+Patch23: valgrind-3.18.1-arm64-atomics-rdm.patch
+
 BuildRequires: make
 BuildRequires: glibc-devel
 
@@ -294,6 +297,7 @@ Valgrind User Manual for details.
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
 
 %build
 # LTO triggers undefined symbols in valgrind.  Valgrind has a --enable-lto
@@ -523,6 +527,9 @@ fi
 %endif
 
 %changelog
+* Thu Feb 10 2022 Mark Wielaard <mjw@redhat.com> - 3.18.1-9
+- Add valgrind-3.18.1-arm64-atomics-rdm.patch
+
 * Thu Jan 13 2022 Mark Wielaard <mjw@redhat.com> - 3.18.1-8
 - Add valgrind-3.18.1-ppc-hwcaps.patch
 - Add valgrind-3.18.1-s390x-wflrx.patch