--- a/mx.graal/mx_graal.py	Thu Jun 25 22:05:11 2015 -0700
+++ b/mx.graal/mx_graal.py	Fri Jun 26 14:05:38 2015 +0200
@@ -46,9 +46,9 @@
 """ The VMs that can be built and run along with an optional description. Only VMs with a
     description are listed in the dialogue for setting the default VM (see _get_vm()). """
 _vmChoices = {
-    'jvmci' : 'Normal compilation is performed with a tiered system (C1 + Graal), Truffle compilation is performed with Graal.',
-    'server' : 'Normal compilation is performed with a tiered system (C1 + C2), Truffle compilation is performed with Graal. Use this for optimal Truffle performance.',
-    'client' : None,  # normal compilation with client compiler, explicit compilation (e.g., by Truffle) with Graal
+    'jvmci' : 'VM triggered compilation is performed with a tiered system (C1 + Graal) and Graal is available for hosted compilation.',
+    'server' : 'Normal compilation is performed with a tiered system (C1 + C2) and Graal is available for hosted compilation.',
+    'client' : None,  # VM compilation with client compiler, hosted compilation with Graal
     'server-nojvmci' : None,  # all compilation with tiered system (i.e., client + server), JVMCI omitted
     'client-nojvmci' : None,  # all compilation with client compiler, JVMCI omitted
     'original' : None,  # default VM copied from bootstrap JDK
@@ -1103,10 +1103,10 @@
         if  len(ignoredArgs) > 0:
             mx.log("Warning: The following options will be ignored by the vm because they come after the '-version' argument: " + ' '.join(ignoredArgs))
 
-    # Unconditionally prepend Truffle to the boot class path.
+    # Unconditionally prepend truffle.jar to the boot class path.
     # This used to be done by the VM itself but was removed to
     # separate the VM from Truffle.
-    truffle_jar = mx.archive(['@TRUFFLE'])[0]
+    truffle_jar = mx.library('TRUFFLE').path
     args = ['-Xbootclasspath/p:' + truffle_jar] + args
 
     args = mx.java().processArgs(args)
@@ -2103,16 +2103,6 @@
 
     mx.run_java(['-jar', jacocoreport.get_path(True), '--in', 'jacoco.exec', '--out', out] + sorted(includedirs))
 
-def sl(args):
-    """run an SL program"""
-    vmArgs, slArgs = mx.extract_VM_args(args)
-    vm(vmArgs + ['-cp', mx.classpath(["TRUFFLE", "com.oracle.truffle.sl"]), "com.oracle.truffle.sl.SLLanguage"] + slArgs)
-
-def sldebug(args):
-    """run a simple command line debugger for the Simple Language"""
-    vmArgs, slArgs = mx.extract_VM_args(args, useDoubleDash=True)
-    vm(vmArgs + ['-cp', mx.classpath("com.oracle.truffle.sl.tools"), "com.oracle.truffle.sl.tools.debug.SLREPLServer"] + slArgs)
-
 def isJVMCIEnabled(vm):
     return vm != 'original' and not vm.endswith('nojvmci')
 
@@ -2323,8 +2313,6 @@
         'vmfg': [vmfg, '[-options] class [args...]'],
         'deoptalot' : [deoptalot, '[n]'],
         'longtests' : [longtests, ''],
-        'sl' : [sl, '[SL args|@VM options]'],
-        'sldebug' : [sldebug, '[SL args|@VM options]'],
         'jol' : [jol, ''],
         'makefile' : [mx_graal_makefile.build_makefile, 'build makefiles for JDK build'],
     }

--- a/mx.graal/suite.py	Thu Jun 25 22:05:11 2015 -0700
+++ b/mx.graal/suite.py	Fri Jun 26 14:05:38 2015 +0200
@@ -101,13 +101,6 @@
       ],
       "sha1" : "0970218476e21c17b90d9f45eb5910b781b12a31",
     },
-    "TRUFFLE_TCK" : {
-      "path" : "lib/truffle-tck-0.8-SNAPSHOT.jar",
-      "urls" : [
-        "http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots/com/oracle/truffle-tck/0.8-dd4050aadaf8d91301b159cb30a609d8bb99feeb-SNAPSHOT/truffle-tck-0.8-dd4050aadaf8d91301b159cb30a609d8bb99feeb-20150616.114824-1.jar",
-      ],
-      "sha1" : "e56929575aebba40c5a38f8368826831f79fbff0",
-    },
     "TRUFFLE_DSL_PROCESSOR" : {
       "path" : "lib/truffle-dsl-processor-0.8-SNAPSHOT.jar",
       "urls" : [
@@ -1045,25 +1038,11 @@
 
     # ------------- GraalTruffle -------------
 
-    "com.oracle.truffle.all" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "TRUFFLE",
-        "TRUFFLE_DSL_PROCESSOR",
-      ],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.7",
-      "workingSets" : "Graal,Truffle",
-      "jacoco" : "exclude",
-    },
-
     "com.oracle.graal.truffle" : {
       "subDir" : "graal",
       "sourceDirs" : ["src"],
       "dependencies" : [
         "TRUFFLE",
-        "TRUFFLE_DSL_PROCESSOR",
         "com.oracle.graal.runtime",
         "com.oracle.graal.replacements",
       ],
@@ -1079,6 +1058,7 @@
       "dependencies" : [
         "com.oracle.graal.truffle",
         "com.oracle.graal.compiler.test",
+        "TRUFFLE_DSL_PROCESSOR",
         "TRUFFLE_SL",
       ],
       "checkstyle" : "com.oracle.graal.graph",
@@ -1185,17 +1165,6 @@
       ],
     },
 
-    "TRUFFLE" : {
-      "path" : "build/truffle.jar",
-      "subDir" : "graal",
-      "sourcesPath" : "build/truffle.src.zip",
-      "javaCompliance" : "1.7",
-      "dependencies" : [
-        "com.oracle.truffle.all",
-        "com.oracle.nfi",
-      ],
-    },
-
     "GRAAL_TRUFFLE" : {
       "path" : "build/graal-truffle.jar",
       "subDir" : "graal",
@@ -1207,8 +1176,10 @@
       ],
       "distDependencies" : [
         "GRAAL",
-        "TRUFFLE",
       ],
+      "exclude" : [
+        "TRUFFLE"
+      ]
     },
   },
 }