Merge from trunk:

  16037  Fix for missing ISA changes in HW cap stuff needs updating patch

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_12_BRANCH@16059

diff --git a/memcheck/tests/vbit-test/irops.c b/memcheck/tests/vbit-test/irops.c
index 67e6e47e3cc421db46402db67d19269b947d783a..5b1106a1ca07bfb2c312444aa04ee01ae5c5a770 100644 (file)
--- a/memcheck/tests/vbit-test/irops.c
+++ b/memcheck/tests/vbit-test/irops.c
@@ -1287,8 +1287,8 @@ get_irop(IROp op)
          case Iop_MulI128by10Carry:
          case Iop_MulI128by10E:
          case Iop_MulI128by10ECarry: {
-            /* IROps require a processor that supports ISA 2.07 (Power 8) or newer */
-            rc = system(MIN_POWER_ISA " 3.0 ");
+            /* IROps require a processor that supports ISA 3.00 (Power 9) or newer */
+            rc = system(MIN_POWER_ISA " 3.00 ");
             rc /= 256;
             /* MIN_POWER_ISA returns 0 if underlying HW supports the
              * specified ISA or newer. Returns 1 if the HW does not support

diff --git a/tests/min_power_isa.c b/tests/min_power_isa.c
index e4035ceb045624cd990710907eeebbe9bd2c1de0..e265c37c558a73d0337e822906406b03b70b73fd 100644 (file)
--- a/tests/min_power_isa.c
+++ b/tests/min_power_isa.c
@@ -64,7 +64,7 @@ int main(int argc, char **argv)
       return !(isa_level >= 8);
 
    } else {
-      fprintf(stderr, "ERROR: invalid ISA version.  Valid versions numbers are:\n" );
+      fprintf(stderr, "ERROR: invalid ISA version '%s'.  Valid versions numbers are:\n", min_isa);
       fprintf(stderr, "       2.05, 2.06, 2.07, 3.00\n" );
       exit(2);
    }