# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1437718939 -7200
# Node ID 697b6b4a7f573be535c3ad6406bbe7aac4509ec1
# Parent  cd04ef3c7c49c1e9df37a9db34f25579fd4e2f5f
merge fixes

diff -r cd04ef3c7c49 -r 697b6b4a7f57 make/defs.make
--- a/make/defs.make	Fri Jul 24 02:11:42 2015 +0200
+++ b/make/defs.make	Fri Jul 24 08:22:19 2015 +0200
@@ -376,6 +376,7 @@
 CONDITIONAL_EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/jdk.internal.jvmci.hotspot.events.EventProvider
 endif
 
+EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/jdk.internal.jvmci.compiler.Compiler
 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/jdk.internal.jvmci.hotspot.HotSpotConstantPool
 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/jdk.internal.jvmci.hotspot.HotSpotConstantReflectionProvider
 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime
diff -r cd04ef3c7c49 -r 697b6b4a7f57 make/jvmci.make
--- a/make/jvmci.make	Fri Jul 24 02:11:42 2015 +0200
+++ b/make/jvmci.make	Fri Jul 24 08:22:19 2015 +0200
@@ -138,8 +138,8 @@
 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.runtime/src -type f 2> /dev/null)
 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.options/src -type f 2> /dev/null)
 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.common/src -type f 2> /dev/null)
+JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.compiler/src -type f 2> /dev/null)
 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.debug/src -type f 2> /dev/null)
-JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.compiler/src -type f 2> /dev/null)
 
 JVMCI_API_JAR = $(TARGET)/jvmci-api.jar
 
diff -r cd04ef3c7c49 -r 697b6b4a7f57 mx.jvmci/suite.py
--- a/mx.jvmci/suite.py	Fri Jul 24 02:11:42 2015 +0200
+++ b/mx.jvmci/suite.py	Fri Jul 24 08:22:19 2015 +0200
@@ -40,7 +40,6 @@
     "jdk.internal.jvmci.service" : {
       "subDir" : "jvmci",
       "sourceDirs" : ["src"],
-      "checkstyle" : "com.oracle.graal.graph",
       "javaCompliance" : "1.8",
       "workingSets" : "API,JVMCI",
     },
@@ -49,7 +48,7 @@
       "subDir" : "jvmci",
       "sourceDirs" : ["src"],
       "dependencies" : ["jdk.internal.jvmci.service"],
-      "checkstyle" : "com.oracle.graal.graph",
+      "checkstyle" : "jdk.internal.jvmci.service",
       "javaCompliance" : "1.8",
       "workingSets" : "JVMCI,Codegen,HotSpot",
     },
@@ -59,7 +58,7 @@
     "jdk.internal.jvmci.common" : {
       "subDir" : "jvmci",
       "sourceDirs" : ["src"],
-      "checkstyle" : "com.oracle.graal.graph",
+      "checkstyle" : "jdk.internal.jvmci.service",
       "javaCompliance" : "1.8",
       "workingSets" : "API,JVMCI",
     },
@@ -67,7 +66,7 @@
     "jdk.internal.jvmci.meta" : {
       "subDir" : "jvmci",
       "sourceDirs" : ["src"],
-      "checkstyle" : "com.oracle.graal.graph",
+      "checkstyle" : "jdk.internal.jvmci.service",
       "javaCompliance" : "1.8",
       "workingSets" : "API,JVMCI",
     },
@@ -76,7 +75,7 @@
       "subDir" : "jvmci",
       "sourceDirs" : ["src"],
       "dependencies" : ["jdk.internal.jvmci.meta"],
-      "checkstyle" : "com.oracle.graal.graph",
+      "checkstyle" : "jdk.internal.jvmci.service",
       "javaCompliance" : "1.8",
       "workingSets" : "API,JVMCI",
     },
@@ -87,7 +86,7 @@
       "dependencies" : [
         "jdk.internal.jvmci.code"
       ],
-      "checkstyle" : "com.oracle.graal.graph",
+      "checkstyle" : "jdk.internal.jvmci.service",
       "javaCompliance" : "1.8",
       "workingSets" : "API,JVMCI",
     },
@@ -100,7 +99,7 @@
         "jdk.internal.jvmci.common",
         "jdk.internal.jvmci.runtime",
       ],
-      "checkstyle" : "com.oracle.graal.graph",
+      "checkstyle" : "jdk.internal.jvmci.service",
       "javaCompliance" : "1.8",
       "workingSets" : "API,JVMCI",
     },
@@ -108,45 +107,19 @@
     "jdk.internal.jvmci.debug" : {
       "subDir" : "jvmci",
       "sourceDirs" : ["src"],
-      "checkstyle" : "com.oracle.graal.graph",
+      "checkstyle" : "jdk.internal.jvmci.service",
       "dependencies" : [
         "jdk.internal.jvmci.service",
       ],
-      "annotationProcessors" : ["jdk.internal.jvmci.options.processor"],
-      "javaCompliance" : "1.8",
-      "workingSets" : "JVMCI,Debug",
-    },
-
-    "com.oracle.graal.debug" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "dependencies" : [
-        "jdk.internal.jvmci.debug",
-        "jdk.internal.jvmci.options",
-        "jdk.internal.jvmci.code",
-      ],
       "annotationProcessors" : ["JVMCI_OPTIONS_PROCESSOR"],
       "javaCompliance" : "1.8",
       "workingSets" : "JVMCI,Debug",
     },
 
-    "com.oracle.graal.debug.test" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "mx:JUNIT",
-        "jdk.internal.jvmci.debug",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "JVMCI,Debug,Test",
-    },
-
     "jdk.internal.jvmci.options" : {
       "subDir" : "jvmci",
       "sourceDirs" : ["src"],
-      "checkstyle" : "com.oracle.graal.graph",
+      "checkstyle" : "jdk.internal.jvmci.service",
       "javaCompliance" : "1.8",
       "workingSets" : "JVMCI",
     },
@@ -158,7 +131,7 @@
         "jdk.internal.jvmci.options",
         "jdk.internal.jvmci.code",
       ],
-      "checkstyle" : "com.oracle.graal.graph",
+      "checkstyle" : "jdk.internal.jvmci.service",
       "annotationProcessors" : ["JVMCI_OPTIONS_PROCESSOR"],
       "javaCompliance" : "1.8",
       "workingSets" : "JVMCI",
@@ -170,7 +143,7 @@
       "dependencies" : [
         "jdk.internal.jvmci.options",
       ],
-      "checkstyle" : "com.oracle.graal.graph",
+      "checkstyle" : "jdk.internal.jvmci.service",
       "javaCompliance" : "1.8",
       "workingSets" : "JVMCI,Codegen",
     },
@@ -182,7 +155,7 @@
         "jdk.internal.jvmci.options",
         "mx:JUNIT",
       ],
-      "checkstyle" : "com.oracle.graal.graph",
+      "checkstyle" : "jdk.internal.jvmci.service",
       "javaCompliance" : "1.8",
       "workingSets" : "JVMCI",
     },
@@ -193,7 +166,7 @@
       "subDir" : "jvmci",
       "sourceDirs" : ["src"],
       "dependencies" : ["jdk.internal.jvmci.code"],
-      "checkstyle" : "com.oracle.graal.graph",
+      "checkstyle" : "jdk.internal.jvmci.service",
       "javaCompliance" : "1.8",
       "workingSets" : "JVMCI,AMD64",
     },
@@ -202,7 +175,7 @@
       "subDir" : "jvmci",
       "sourceDirs" : ["src"],
       "dependencies" : ["jdk.internal.jvmci.code"],
-      "checkstyle" : "com.oracle.graal.graph",
+      "checkstyle" : "jdk.internal.jvmci.service",
       "javaCompliance" : "1.8",
       "workingSets" : "JVMCI,SPARC",
     },
@@ -223,7 +196,7 @@
         "JVMCI_OPTIONS_PROCESSOR",
         "JVMCI_SERVICE_PROCESSOR",
       ],
-      "checkstyle" : "com.oracle.graal.graph",
+      "checkstyle" : "jdk.internal.jvmci.service",
       "javaCompliance" : "1.8",
       "workingSets" : "JVMCI",
     },
@@ -231,7 +204,7 @@
     "jdk.internal.jvmci.hotspotvmconfig" : {
       "subDir" : "jvmci",
       "sourceDirs" : ["src"],
-      "checkstyle" : "com.oracle.graal.graph",
+      "checkstyle" : "jdk.internal.jvmci.service",
       "javaCompliance" : "1.8",
       "workingSets" : "JVMCI,HotSpot",
     },
@@ -240,7 +213,7 @@
       "subDir" : "jvmci",
       "sourceDirs" : ["src"],
       "dependencies" : ["jdk.internal.jvmci.hotspotvmconfig", "jdk.internal.jvmci.common"],
-      "checkstyle" : "com.oracle.graal.graph",
+      "checkstyle" : "jdk.internal.jvmci.service",
       "javaCompliance" : "1.8",
       "workingSets" : "JVMCI,HotSpot,Codegen",
     },
@@ -252,7 +225,7 @@
         "jdk.internal.jvmci.amd64",
         "jdk.internal.jvmci.hotspot",
       ],
-      "checkstyle" : "com.oracle.graal.graph",
+      "checkstyle" : "jdk.internal.jvmci.service",
       "annotationProcessors" : [
         "JVMCI_SERVICE_PROCESSOR",
       ],
@@ -267,7 +240,7 @@
         "jdk.internal.jvmci.sparc",
         "jdk.internal.jvmci.hotspot",
       ],
-      "checkstyle" : "com.oracle.graal.graph",
+      "checkstyle" : "jdk.internal.jvmci.service",
       "annotationProcessors" : [
         "JVMCI_SERVICE_PROCESSOR",
       ],
@@ -282,7 +255,7 @@
         "jdk.internal.jvmci.hotspot",
         "JFR",
       ],
-      "checkstyle" : "com.oracle.graal.graph",
+      "checkstyle" : "jdk.internal.jvmci.service",
       "annotationProcessors" : ["JVMCI_SERVICE_PROCESSOR"],
       "javaCompliance" : "1.8",
       "profile" : "",
@@ -367,7 +340,6 @@
       "subDir" : "jvmci",
       "sourcesPath" : "build/jvmci-test.src.zip",
       "dependencies" : [
-        "jdk.internal.jvmci.debug.test",
         "jdk.internal.jvmci.options.test",
         "jdk.internal.jvmci.runtime.test",
       ],