From: Carl Love <cel@us.ibm.com>
Date: Tue, 11 Oct 2016 17:01:42 +0000 (+0000)
Subject: Fix for missing ISA changes in HW cap stuff needs updating patch
X-Git-Tag: svn/VALGRIND_3_13_0~344
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=ffb3146248c31e21592427c8499462424dcf3234;p=thirdparty%2Fvalgrind.git

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

A couple things got missed in the previous HW cap stuff needs updating patch
that cause the vbit tester to fail.  The fixes are based on the patch
submitted by Mark Weilaard.

The changes were missed in Valgrind commit 16034

bugzilla 370265

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16037
---

diff --git a/memcheck/tests/vbit-test/irops.c b/memcheck/tests/vbit-test/irops.c
index 67e6e47e3c..5b1106a1ca 100644
--- 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 e4035ceb04..e265c37c55 100644
--- 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);
    }