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.

diff --git a/NEWS b/NEWS
index 054c25da7bf20d06e7330c3c9c0376c5b4ad9472..981f69c2f5e14357ec3cfbd31918d09b71510f27 100644 (file)
--- 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 a39930f49db4c07f719cc4701897d811151d14b2..bb1738a0b1567b0dc581e822b8475714560c481a 100644 (file)
--- 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();
    }