stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Jesper Wilhelmsson 2017-01-24 00:30:23 +01:00
commit ca84662142
5 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5180,7 +5180,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=1484571183 DATE_WHEN_GENERATED=1485214214
############################################################################### ###############################################################################
# #

8
common/bin/unshuffle_list.txt
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -1330,9 +1330,9 @@ jdk/src/jdk.jdwp.agent/unix/native/libdt_socket : jdk/src/solaris/transport/sock
jdk/src/jdk.jdwp.agent/unix/native/libjdwp : jdk/src/solaris/back jdk/src/jdk.jdwp.agent/unix/native/libjdwp : jdk/src/solaris/back
jdk/src/jdk.jdwp.agent/windows/native/libdt_socket : jdk/src/windows/transport/socket jdk/src/jdk.jdwp.agent/windows/native/libdt_socket : jdk/src/windows/transport/socket
jdk/src/jdk.jdwp.agent/windows/native/libjdwp : jdk/src/windows/back jdk/src/jdk.jdwp.agent/windows/native/libjdwp : jdk/src/windows/back
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor : jdk/src/share/classes/sun/jvmstat/monitor jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor : jdk/src/share/classes/sun/jvmstat/monitor
jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata : jdk/src/share/classes/sun/jvmstat/perfdata jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata : jdk/src/share/classes/sun/jvmstat/perfdata
jdk/src/jdk.jvmstat/share/classes/sun/tools/jstatd : jdk/src/share/classes/sun/tools/jstatd jdk/src/jdk.internal.jvmstat/share/classes/sun/tools/jstatd : jdk/src/share/classes/sun/tools/jstatd
jdk/src/jdk.localedata/share/classes/sun/text/resources/ar : jdk/src/share/classes/sun/text/resources/ar jdk/src/jdk.localedata/share/classes/sun/text/resources/ar : jdk/src/share/classes/sun/text/resources/ar
jdk/src/jdk.localedata/share/classes/sun/text/resources/be : jdk/src/share/classes/sun/text/resources/be jdk/src/jdk.localedata/share/classes/sun/text/resources/be : jdk/src/share/classes/sun/text/resources/be
jdk/src/jdk.localedata/share/classes/sun/text/resources/bg : jdk/src/share/classes/sun/text/resources/bg jdk/src/jdk.localedata/share/classes/sun/text/resources/bg : jdk/src/share/classes/sun/text/resources/bg

4
make/CompileJavaModules.gmk
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -450,7 +450,7 @@ jdk.dev_COPY := .js oqlhelp.html .txt
################################################################################ ################################################################################
jdk.jvmstat_COPY := aliasmap jdk.internal.jvmstat_COPY := aliasmap
################################################################################ ################################################################################

22
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,8 @@ 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.emulatedClient", vmEmulatedClient());
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 +169,24 @@ public class VMProps implements Callable<Map<String, String>> {
return "" + (WB.getBooleanVMFlag("EnableJVMCI") != null); return "" + (WB.getBooleanVMFlag("EnableJVMCI") != null);
} }
/**
* @return true if VM runs in emulated-client mode and false otherwise.
*/
protected String vmEmulatedClient() {
String vmInfo = System.getProperty("java.vm.info");
if (vmInfo == null) {
return "false";
}
return "" + vmInfo.contains(" emulated-client");
}
/**
* @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:

4
test/lib/jdk/test/lib/Platform.java
View File

@ -63,6 +63,10 @@ public class Platform {
return vmName.contains("Embedded"); return vmName.contains("Embedded");
} }
public static boolean isEmulatedClient() {
return vmInfo.contains(" emulated-client");
}
public static boolean isTieredSupported() { public static boolean isTieredSupported() {
return compiler.contains("Tiered Compilers"); return compiler.contains("Tiered Compilers");
} }