changeset 2492:2cbdf0b3aa54

Merge
author jwilhelm
date Fri, 13 Jan 2017 18:26:33 +0100
parents f277629427ce 5e9026997790
children d660c00d91bf
files common/autoconf/generated-configure.sh
diffstat 2 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh	Thu Jan 12 10:30:27 2017 +0100
+++ b/common/autoconf/generated-configure.sh	Fri Jan 13 18:26:33 2017 +0100
@@ -5178,7 +5178,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1484135958
+DATE_WHEN_GENERATED=1484328385
 
 ###############################################################################
 #
--- a/test/jtreg-ext/requires/VMProps.java	Thu Jan 12 10:30:27 2017 +0100
+++ b/test/jtreg-ext/requires/VMProps.java	Fri Jan 13 18:26:33 2017 +0100
@@ -33,6 +33,8 @@
 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 @@
         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);
@@ -166,6 +169,13 @@
     }
 
     /**
+     * @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:
      *    VM supports G1