From 396af967d63efb78f4cb652f51dc247b92bc2c67 Mon Sep 17 00:00:00 2001
From: Boris Molodenkov <bmoloden@openjdk.org>
Date: Wed, 21 Dec 2016 14:41:48 +0300
Subject: [PATCH 1/2] 8170918: Remove shell script from
 test/compiler/c2/cr7200264/TestIntVect.java

Reviewed-by: kvn
---
 test/jtreg-ext/requires/VMProps.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/test/jtreg-ext/requires/VMProps.java b/test/jtreg-ext/requires/VMProps.java
index 06299e7ecd5..15c854f964b 100644
--- a/test/jtreg-ext/requires/VMProps.java
+++ b/test/jtreg-ext/requires/VMProps.java
@@ -33,6 +33,8 @@ import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
+import sun.hotspot.cpuinfo.CPUInfo;
 import sun.hotspot.gc.GC;
 import sun.hotspot.WhiteBox;
 
@@ -62,6 +64,7 @@ public class VMProps implements Callable<Map<String, String>> {
         map.put("vm.simpleArch", vmArch());
         map.put("vm.debug", vmDebug());
         map.put("vm.jvmci", vmJvmci());
+        map.put("vm.cpu.features", cpuFeatures());
         vmGC(map); // vm.gc.X = true/false
 
         VMProps.dump(map);
@@ -165,6 +168,13 @@ public class VMProps implements Callable<Map<String, String>> {
         return "" + (WB.getBooleanVMFlag("EnableJVMCI") != null);
     }
 
+    /**
+     * @return supported CPU features
+     */
+    protected String cpuFeatures() {
+        return CPUInfo.getFeatures().toString();
+    }
+
     /**
      * For all existing GC sets vm.gc.X property.
      * Example vm.gc.G1=true means:

From dcb007ab96d2b9cf120a6caa554fc62241bc2cb2 Mon Sep 17 00:00:00 2001
From: Igor Ignatyev <iignatyev@openjdk.org>
Date: Wed, 28 Dec 2016 18:37:09 +0300
Subject: [PATCH 2/2] 8172094: 8171433 changes in generated-configure should be
 restored

Reviewed-by: erikj, kzhaldyb
---
 common/autoconf/generated-configure.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index 644f25ab435..13c74505795 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -5170,7 +5170,7 @@ VS_SDK_PLATFORM_NAME_2013=
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1482309967
+DATE_WHEN_GENERATED=1483099656
 
 ###############################################################################
 #
@@ -52997,7 +52997,7 @@ $as_echo "yes, forced" >&6; }
 $as_echo "no, forced" >&6; }
     BUILD_GTEST="false"
   elif test "x$enable_hotspot_gtest" = "x"; then
-    if test "x$GTEST_DIR_EXISTS" = "xtrue" && test "x$OPENJDK_TARGET_OS" != "xaix"; then
+    if test "x$GTEST_DIR_EXISTS" = "xtrue"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
       BUILD_GTEST="true"