# HG changeset patch
# User jwilhelm
# Date 1485214223 -3600
# Node ID 803e48f66d054d221c200029f25835351f6f5252
# Parent  ec5d8078e628195f04119f6109210c5b05b315ab# Parent  f8ff08c45b493019171413c47c80fbd440dadf45
Merge

diff -r ec5d8078e628 -r 803e48f66d05 common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Sat Jan 21 08:38:52 2017 +0800
+++ b/common/autoconf/generated-configure.sh	Tue Jan 24 00:30:23 2017 +0100
@@ -5180,7 +5180,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1484571183
+DATE_WHEN_GENERATED=1485214214
 
 ###############################################################################
 #
diff -r ec5d8078e628 -r 803e48f66d05 common/bin/unshuffle_list.txt
--- a/common/bin/unshuffle_list.txt	Sat Jan 21 08:38:52 2017 +0800
+++ b/common/bin/unshuffle_list.txt	Tue Jan 24 00:30:23 2017 +0100
@@ -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.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -1330,9 +1330,9 @@
 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/libjdwp : jdk/src/windows/back
-jdk/src/jdk.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.jvmstat/share/classes/sun/tools/jstatd : jdk/src/share/classes/sun/tools/jstatd
+jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor : jdk/src/share/classes/sun/jvmstat/monitor
+jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata : jdk/src/share/classes/sun/jvmstat/perfdata
+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/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
diff -r ec5d8078e628 -r 803e48f66d05 make/CompileJavaModules.gmk
--- a/make/CompileJavaModules.gmk	Sat Jan 21 08:38:52 2017 +0800
+++ b/make/CompileJavaModules.gmk	Tue Jan 24 00:30:23 2017 +0100
@@ -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.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -450,7 +450,7 @@
 
 ################################################################################
 
-jdk.jvmstat_COPY := aliasmap
+jdk.internal.jvmstat_COPY := aliasmap
 
 ################################################################################
 
diff -r ec5d8078e628 -r 803e48f66d05 test/jtreg-ext/requires/VMProps.java
--- a/test/jtreg-ext/requires/VMProps.java	Sat Jan 21 08:38:52 2017 +0800
+++ b/test/jtreg-ext/requires/VMProps.java	Tue Jan 24 00:30:23 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,8 @@
         map.put("vm.simpleArch", vmArch());
         map.put("vm.debug", vmDebug());
         map.put("vm.jvmci", vmJvmci());
+        map.put("vm.emulatedClient", vmEmulatedClient());
+        map.put("vm.cpu.features", cpuFeatures());
         vmGC(map); // vm.gc.X = true/false
 
         VMProps.dump(map);
@@ -166,6 +170,24 @@
     }
 
     /**
+     * @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.
      * Example vm.gc.G1=true means:
      *    VM supports G1
diff -r ec5d8078e628 -r 803e48f66d05 test/lib/jdk/test/lib/Platform.java
--- a/test/lib/jdk/test/lib/Platform.java	Sat Jan 21 08:38:52 2017 +0800
+++ b/test/lib/jdk/test/lib/Platform.java	Tue Jan 24 00:30:23 2017 +0100
@@ -63,6 +63,10 @@
         return vmName.contains("Embedded");
     }
 
+    public static boolean isEmulatedClient() {
+        return vmInfo.contains(" emulated-client");
+    }
+
     public static boolean isTieredSupported() {
         return compiler.contains("Tiered Compilers");
     }