import valgrind-3.18.1-7.el8

SOURCES/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;
+       }
+ 

SPECS/valgrind.spec

@@ -3,7 +3,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: %{?scl_prefix}valgrind
 Version: 3.18.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.valgrind.org/
@@ -129,6 +129,9 @@ Patch17: valgrind-3.18.1-condvar.patch
 # KDE#445668 Inline stack frame generation is broken for Rust binaries
 Patch18: valgrind-3.18.1-demangle-namespace.patch
 
+# KDE#449494 arm64: Mismatch detected between RDMA and atomics features
+Patch19: valgrind-3.18.1-arm64-atomics-rdm.patch
+
 BuildRequires: make
 BuildRequires: glibc-devel
 
@@ -282,6 +285,7 @@ Valgrind User Manual for details.
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 
 %build
 
@@ -507,6 +511,9 @@ fi
 %endif
 
 %changelog
+* Thu Feb 10 2022 Mark Wielaard <mjw@redhat.com> - 3.18.1-7
+- Add valgrind-3.18.1-arm64-atomics-rdm.patch
+
 * Tue Nov 30 2021 Mark Wielaard <mjw@redhat.com> - 3.18.1-6
 - Rebuild against fresh toolchain