From cd20c8ca5815f0abf9d1bdb47888753bdb5c5738 Mon Sep 17 00:00:00 2001 From: Petar Jovanovic Date: Thu, 14 Mar 2019 16:02:53 +0000 Subject: [PATCH] Finetune arch_hwcaps() in none/tests/libvex_test.c The libvexmultiarch_test failed on s390, since VEX was configured for MIPS64 with 32bit FPUs. Modify arch_hwcaps() to a realist case with 64bit FPUs. This fixes KDE #402351. --- NEWS | 1 + none/tests/libvex_test.c | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 054c25da7b..981f69c2f5 100644 --- a/NEWS +++ b/NEWS @@ -97,6 +97,7 @@ where XXXXXX is the bug number as listed below. 402134 assertion fail in mc_translate.c (noteTmpUsesIn) Iex_VECRET on arm64 402327 Warning: DWARF2 CFI reader: unhandled DW_OP_ opcode 0x13 (DW_OP_drop) 402341 drd/tests/tsan_thread_wrappers_pthread.h:369: suspicious code ? +402351 mips64 libvexmultiarch_test fails on s390x 402369 Overhaul DHAT 402395 coregrind/vgdb-invoker-solaris.c: 2 * poor error checking 402480 Do not use %rsp in clobber list diff --git a/none/tests/libvex_test.c b/none/tests/libvex_test.c index a39930f49d..bb1738a0b1 100644 --- a/none/tests/libvex_test.c +++ b/none/tests/libvex_test.c @@ -127,11 +127,13 @@ static UInt arch_hwcaps (VexArch va) { case VexArchPPC64: return 0; case VexArchS390X: return VEX_HWCAPS_S390X_LDISP; #if (__mips_isa_rev>=6) - case VexArchMIPS32: return VEX_PRID_COMP_MIPS | VEX_MIPS_CPU_ISA_M32R6; - case VexArchMIPS64: return VEX_PRID_COMP_MIPS | VEX_MIPS_CPU_ISA_M64R6; + case VexArchMIPS32: return VEX_PRID_COMP_MIPS | VEX_MIPS_CPU_ISA_M32R6 | + VEX_MIPS_HOST_FR; + case VexArchMIPS64: return VEX_PRID_COMP_MIPS | VEX_MIPS_CPU_ISA_M64R6 | + VEX_MIPS_HOST_FR; #else case VexArchMIPS32: return VEX_PRID_COMP_MIPS; - case VexArchMIPS64: return VEX_PRID_COMP_MIPS; + case VexArchMIPS64: return VEX_PRID_COMP_MIPS | VEX_MIPS_HOST_FR; #endif default: failure_exit(); } -- 2.47.2