# HG changeset patch
# User thartmann
# Date 1453970957 -3600
# Node ID 736bb9fb4a02a365121d465d36ec8ef45b12d526
# Parent  d74d44e1719c68193f1bd24a6fcc6a438cc8143c# Parent  d1574b8c2bd37879df6e9a16bf826af08cc8f3a4
Merge

diff -r d74d44e1719c -r 736bb9fb4a02 make/CompileJavaModules.gmk
--- a/make/CompileJavaModules.gmk	Tue Jan 26 17:13:16 2016 +0100
+++ b/make/CompileJavaModules.gmk	Thu Jan 28 09:49:17 2016 +0100
@@ -467,18 +467,6 @@
 
 ################################################################################
 
-jdk.vm.ci_EXCLUDE_FILES += \
-    jdk/vm/ci/options/processor/OptionProcessor.java \
-    jdk/vm/ci/service/processor/ServiceProviderProcessor.java \
-    #
-
-jdk.vm.ci_EXCLUDES += \
-    META-INF/jvmci.options \
-    META-INF/jvmci.providers \
-    #
-
-################################################################################
-
 jdk.xml.bind_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
 jdk.xml.bind_CLEAN := .properties
 jdk.xml.bind_COPY := .xsd JAXBContextFactory.java ZeroOneBooleanAdapter.java
diff -r d74d44e1719c -r 736bb9fb4a02 test/lib/share/classes/jdk/test/lib/Platform.java
--- a/test/lib/share/classes/jdk/test/lib/Platform.java	Tue Jan 26 17:13:16 2016 +0100
+++ b/test/lib/share/classes/jdk/test/lib/Platform.java	Thu Jan 28 09:49:17 2016 +0100
@@ -34,6 +34,7 @@
     private static final String vmName      = System.getProperty("java.vm.name");
     private static final String userName    = System.getProperty("user.name");
     private static final String compiler    = System.getProperty("sun.management.compiler");
+    private static final String vmInfo      = System.getProperty("java.vm.info");
 
     public static boolean isClient() {
         return vmName.endsWith(" Client VM");
@@ -63,6 +64,18 @@
         return compiler.contains("Tiered Compilers");
     }
 
+    public static boolean isInt() {
+        return vmInfo.contains("interpreted");
+    }
+
+    public static boolean isMixed() {
+        return vmInfo.contains("mixed");
+    }
+
+    public static boolean isComp() {
+        return vmInfo.contains("compiled");
+    }
+
     public static boolean is32bit() {
         return dataModel.equals("32");
     }
@@ -135,12 +148,6 @@
         return isArch("aarch64");
     }
 
-    private static boolean isArch(String archnameRE) {
-        return Pattern.compile(archnameRE, Pattern.CASE_INSENSITIVE)
-                .matcher(osArch)
-                .matches();
-    }
-
     public static String getOsArch() {
         return osArch;
     }
@@ -203,4 +210,10 @@
     public static boolean canAttachOSX() throws Exception {
         return userName.equals("root");
     }
+
+    private static boolean isArch(String archnameRE) {
+        return Pattern.compile(archnameRE, Pattern.CASE_INSENSITIVE)
+                      .matcher(osArch)
+                      .matches();
+    }
 }