Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/valgrind.git#14c0a54d5fc9ccf3441bec9f6c8e8c837603c40a

valgrind-3.16.1-arm64-fma.patch

@@ -714,3 +714,16 @@ index 000000000..b4c53eea4
 -- 
 2.18.4
 
+diff --git a/VEX/priv/guest_generic_bb_to_IR.c b/VEX/priv/guest_generic_bb_to_IR.c
+index 0cee970e4..1e72ddacd 100644
+--- a/VEX/priv/guest_generic_bb_to_IR.c
++++ b/VEX/priv/guest_generic_bb_to_IR.c
+@@ -422,6 +422,8 @@ static Bool expr_is_guardable ( const IRExpr* e )
+          return !primopMightTrap(e->Iex.Binop.op);
+       case Iex_Triop:
+          return !primopMightTrap(e->Iex.Triop.details->op);
++      case Iex_Qop:
++         return !primopMightTrap(e->Iex.Qop.details->op);
+       case Iex_ITE:
+       case Iex_CCall:
+       case Iex_Get:

valgrind.spec

@@ -3,7 +3,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: %{?scl_prefix}valgrind
 Version: 3.16.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.valgrind.org/
@@ -127,6 +127,7 @@ Patch16: valgrind-3.16.1-s390x-z14-vector.patch
 Patch17: valgrind-3.16.1-stxsibx-stxsihx.patch
 
 # KDE#426014 arm64: implement fmadd and fmsub as Iop_MAdd/Sub
+# KDE#430485 expr_is_guardable doesn't handle Iex_Qop
 Patch18: valgrind-3.16.1-arm64-fma.patch
 
 BuildRequires: glibc-devel
@@ -499,6 +500,9 @@ fi
 %endif
 
 %changelog
+* Thu Dec 17 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.16.1-11
+- Update valgrind-3.16.1-arm64-fma.patch
+
 * Tue Dec 15 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.16.1-10
 - Add valgrind-3.16.1-arm64-fma.patch