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 340b727..190a90b 100644 --- a/valgrind.spec +++ b/valgrind.spec @@ -143,6 +143,9 @@ Patch22: valgrind-3.18.1-s390x-wflrx.patch # KDE#449672 ppc64 --track-origins=yes failure because of bad cmov addHRegUse Patch23: valgrind-3.18.1-ppc64-cmov.patch +# KDE#449494 arm64: Mismatch detected between RDMA and atomics features +Patch24: valgrind-3.18.1-arm64-atomics-rdm.patch + BuildRequires: make BuildRequires: glibc-devel @@ -298,6 +301,7 @@ Valgrind User Manual for details. %patch21 -p1 %patch22 -p1 %patch23 -p1 +%patch24 -p1 %build # LTO triggers undefined symbols in valgrind. Valgrind has a --enable-lto @@ -529,6 +533,7 @@ fi %changelog * Tue Feb 8 2022 Mark Wielaard - Add valgrind-3.18.1-ppc64-cmov.patch +- Add valgrind-3.18.1-arm64-atomics-rdm.patch * Sat Jan 22 2022 Fedora Release Engineering - 1:3.18.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild