archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-17 09:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Jesper Wilhelmsson 2017-01-09 17:10:31 +01:00
commit 80ea26ae10
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/autoconf/generated-configure.sh
View file

@ -5167,7 +5167,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE #CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks: # Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1483542685 DATE_WHEN_GENERATED=1483978216
############################################################################### ###############################################################################
# #

10
test/jtreg-ext/requires/VMProps.java
View file

@ -33,6 +33,8 @@ import java.util.Map;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import sun.hotspot.cpuinfo.CPUInfo;
import sun.hotspot.gc.GC; import sun.hotspot.gc.GC;
import sun.hotspot.WhiteBox; import sun.hotspot.WhiteBox;
@ -62,6 +64,7 @@ public class VMProps implements Callable<Map<String, String>> {
map.put("vm.simpleArch", vmArch()); map.put("vm.simpleArch", vmArch());
map.put("vm.debug", vmDebug()); map.put("vm.debug", vmDebug());
map.put("vm.jvmci", vmJvmci()); map.put("vm.jvmci", vmJvmci());
map.put("vm.cpu.features", cpuFeatures());
vmGC(map); // vm.gc.X = true/false vmGC(map); // vm.gc.X = true/false
VMProps.dump(map); VMProps.dump(map);
@ -165,6 +168,13 @@ public class VMProps implements Callable<Map<String, String>> {
return "" + (WB.getBooleanVMFlag("EnableJVMCI") != null); 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. * For all existing GC sets vm.gc.X property.
* Example vm.gc.G1=true means: * Example vm.gc.G1=true means: