# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1442956376 -7200
# Node ID 1ec6d2962ff5e0316ba57074bf6b28f6b1046883
# Parent  8030c4d3871555ec452df227e1e2a08e0afc195e
adapted CompileTheWorld for switch to -Djvmci.option.<name>=<value> format

diff -r 8030c4d38715 -r 1ec6d2962ff5 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java	Tue Sep 22 13:23:15 2015 -0700
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java	Tue Sep 22 23:12:56 2015 +0200
@@ -108,14 +108,19 @@
         /**
          * Creates a {@link Config} object by parsing a set of space separated override options.
          *
-         * @param options a space or hash separated set of option value settings with each option
-         *            setting in a format compatible with {@link OptionsParser#parseOption}. Ignored
-         *            if null.
+         * @param options a space separated set of option value settings with each option setting in
+         *            a -G:<value> format but without the leading "-G:". Ignored if null.
          */
         public Config(String options) {
             if (options != null) {
-                for (String option : options.split("\\s+|#")) {
-                    OptionsParser.parseOption(option, this, null);
+                for (String optionSetting : options.split("\\s+|#")) {
+                    if (optionSetting.charAt(0) == '-') {
+                        OptionsParser.parseOptionSetting(optionSetting.substring(1) + "=false", this, null);
+                    } else if (optionSetting.charAt(0) == '+') {
+                        OptionsParser.parseOptionSetting(optionSetting.substring(1) + "=true", this, null);
+                    } else {
+                        OptionsParser.parseOptionSetting(optionSetting, this, null);
+                    }
                 }
             }
         }
diff -r 8030c4d38715 -r 1ec6d2962ff5 mx.graal/suite.py
--- a/mx.graal/suite.py	Tue Sep 22 13:23:15 2015 -0700
+++ b/mx.graal/suite.py	Tue Sep 22 23:12:56 2015 +0200
@@ -6,7 +6,7 @@
     "suites": [
             {
                "name" : "jvmci",
-               "version" : "a4b63f56bc974ded88648d0e0149bf1ba6887d28",
+               "version" : "d3930fdd1eb3e9edcca8d585eb5394fc09aa9a2c",
                "urls" : [
                     {"url" : "http://lafo.ssw.uni-linz.ac.at/hg/graal-jvmci-8", "kind" : "hg"},
                     {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},