From d4756990d702dbd2ff1d68f1dfab82ccd114673c Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@fedoraproject.org>
Date: Dec 20 2020 20:41:07 +0000
Subject: 3.16.1-12 - Add valgrind-3.16.1-arm64-expensive-cmp.patch


---

diff --git a/valgrind-3.16.1-arm64-expensive-cmp.patch b/valgrind-3.16.1-arm64-expensive-cmp.patch
new file mode 100644
index 0000000..b2f8b50
--- /dev/null
+++ b/valgrind-3.16.1-arm64-expensive-cmp.patch
@@ -0,0 +1,19 @@
+commit 359b98828ced9cfff8c1badfed75c7ef999cfee5
+Author: Julian Seward <jseward@acm.org>
+Date:   Sun Nov 15 18:28:09 2020 +0100
+
+    memcheck: on arm64, use expensive instrumentation for Cmp{EQ,NE}64 by default.
+
+diff --git a/memcheck/mc_translate.c b/memcheck/mc_translate.c
+index b32c9c9c5..e91d51094 100644
+--- a/memcheck/mc_translate.c
++++ b/memcheck/mc_translate.c
+@@ -8485,6 +8485,8 @@ IRSB* MC_(instrument) ( VgCallbackClosure* closure,
+ #     elif defined(VGA_ppc64le)
+       // Needed by (at least) set_AV_CR6() in the front end.
+       mce.dlbo.dl_CmpEQ64_CmpNE64 = DLexpensive;
++#     elif defined(VGA_arm64)
++      mce.dlbo.dl_CmpEQ64_CmpNE64 = DLexpensive;
+ #     endif
+ 
+       /* preInstrumentationAnalysis() will allocate &mce.tmpHowUsed and then
diff --git a/valgrind.spec b/valgrind.spec
index db14efe..50ffe12 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.16.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.valgrind.org/
@@ -133,6 +133,10 @@ Patch18: valgrind-3.16.1-arm64-fma.patch
 # KDE#397605 Add support for Linux FICLONE ioctl
 Patch19: valgrind-3.16.1-ficlone.patch
 
+# rhbz#1909415 valgrind makes false complaint about strcmp() on aarch64
+# upstream git commit 359b98828
+Patch20: valgrind-3.16.1-arm64-expensive-cmp.patch
+
 BuildRequires: glibc-devel
 
 %if %{build_openmpi}
@@ -280,6 +284,7 @@ Valgrind User Manual for details.
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 
 %build
 # LTO triggers undefined symbols in valgrind.  Valgrind has a --enable-lto
@@ -504,8 +509,9 @@ fi
 %endif
 
 %changelog
-* Sun Dec 20 2020 Mark Wielaard <mjw@fedoraproject.org>
+* Sun Dec 20 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.16.1-12
 - Add valgrind-3.16.1-ficlone.patch
+- Add valgrind-3.16.1-arm64-expensive-cmp.patch
 
 * Thu Dec 17 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.16.1-11
 - Update valgrind-3.16.1-arm64-fma.patch