# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1427405178 -3600
# Node ID b9041d4e91c5dda941353ecf5d33367cac55bdd0
# Parent  b2e8b26f504052e86a58635b71a8ba900edf7c29# Parent  e87754e57be7548cbfe2f24412b7f996d7053be0
Merge.

diff -r b2e8b26f5040 -r b9041d4e91c5 graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/UntrustedInterfaces.java
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/UntrustedInterfaces.java	Thu Mar 26 21:58:45 2015 +0100
+++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/UntrustedInterfaces.java	Thu Mar 26 22:26:18 2015 +0100
@@ -23,7 +23,7 @@
 package com.oracle.graal.jtt.except;
 
 import org.junit.*;
-import org.objectweb.asm.*;
+import jdk.internal.org.objectweb.asm.*;
 
 import com.oracle.graal.jtt.*;
 
diff -r b2e8b26f5040 -r b9041d4e91c5 mx/suite.py
--- a/mx/suite.py	Thu Mar 26 21:58:45 2015 +0100
+++ b/mx/suite.py	Thu Mar 26 22:26:18 2015 +0100
@@ -139,21 +139,6 @@
       ],
     },
 
-    "ASM" : {
-      "path" : "lib/asm-5.0.3.jar",
-      "urls" : [
-        "http://lafo.ssw.uni-linz.ac.at/graal-external-deps/asm-5.0.3.jar",
-        "https://search.maven.org/remotecontent?filepath=org/ow2/asm/asm/5.0.3/asm-5.0.3.jar",
-      ],
-      "sha1" : "dcc2193db20e19e1feca8b1240dbbc4e190824fa",
-      "sourcePath" : "lib/asm-5.0.3-sources.jar",
-      "sourceSha1" : "f0f24f6666c1a15c7e202e91610476bd4ce59368",
-      "sourceUrls" : [
-        "http://lafo.ssw.uni-linz.ac.at/graal-external-deps/asm-5.0.3-sources.jar",
-        "https://search.maven.org/remotecontent?filepath=org/ow2/asm/asm/5.0.3/asm-5.0.3-sources.jar",
-      ],
-    },
-
     "JAVA_ALLOCATION_INSTRUMENTER" : {
       "path" : "lib/java-allocation-instrumenter.jar",
       "sourcePath" : "lib/java-allocation-instrumenter.jar",
@@ -880,7 +865,6 @@
       "sourceDirs" : ["src"],
       "dependencies" : [
         "com.oracle.graal.compiler.test",
-        "ASM",
       ],
       "checkstyle" : "com.oracle.graal.graph",
       "javaCompliance" : "1.8",