--- a/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64Address.java	Tue Sep 22 11:50:36 2015 +0200
+++ b/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64Address.java	Tue Sep 22 15:43:15 2015 +0200
@@ -22,9 +22,10 @@
  */
 package com.oracle.graal.asm.amd64;
 
-import jdk.internal.jvmci.code.AbstractAddress;
 import jdk.internal.jvmci.code.Register;
 
+import com.oracle.graal.asm.AbstractAddress;
+
 /**
  * Represents an address in target machine memory, specified via some combination of a base
  * register, an index register, a displacement and a scale. Note that the base and index registers

--- a/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCAddress.java	Tue Sep 22 11:50:36 2015 +0200
+++ b/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCAddress.java	Tue Sep 22 15:43:15 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,11 @@
 import static jdk.internal.jvmci.sparc.SPARC.STACK_BIAS;
 import static jdk.internal.jvmci.sparc.SPARC.fp;
 import static jdk.internal.jvmci.sparc.SPARC.sp;
-import jdk.internal.jvmci.code.AbstractAddress;
 import jdk.internal.jvmci.code.Register;
 import jdk.internal.jvmci.sparc.SPARC;
 
+import com.oracle.graal.asm.AbstractAddress;
+
 public class SPARCAddress extends AbstractAddress {
 
     private final Register base;

--- a/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCMacroAssembler.java	Tue Sep 22 11:50:36 2015 +0200
+++ b/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCMacroAssembler.java	Tue Sep 22 15:43:15 2015 +0200
@@ -37,13 +37,13 @@
 
 import java.util.function.Consumer;
 
-import jdk.internal.jvmci.code.AbstractAddress;
 import jdk.internal.jvmci.code.Register;
 import jdk.internal.jvmci.code.RegisterConfig;
 import jdk.internal.jvmci.code.TargetDescription;
 import jdk.internal.jvmci.sparc.SPARC;
 import jdk.internal.jvmci.sparc.SPARC.CPUFeature;
 
+import com.oracle.graal.asm.AbstractAddress;
 import com.oracle.graal.asm.Label;
 
 public class SPARCMacroAssembler extends SPARCAssembler {

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.graal.asm/src/com/oracle/graal/asm/AbstractAddress.java	Tue Sep 22 15:43:15 2015 +0200
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.graal.asm;
+
+/**
+ * Abstract base class that represents a platform specific address.
+ */
+public abstract class AbstractAddress {
+}

--- a/graal/com.oracle.graal.asm/src/com/oracle/graal/asm/Assembler.java	Tue Sep 22 11:50:36 2015 +0200
+++ b/graal/com.oracle.graal.asm/src/com/oracle/graal/asm/Assembler.java	Tue Sep 22 15:43:15 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 import java.util.List;
 import java.util.Map;
 
-import jdk.internal.jvmci.code.AbstractAddress;
 import jdk.internal.jvmci.code.Register;
 import jdk.internal.jvmci.code.StackSlot;
 import jdk.internal.jvmci.code.TargetDescription;

--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/CompilationResultBuilder.java	Tue Sep 22 11:50:36 2015 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/CompilationResultBuilder.java	Tue Sep 22 15:43:15 2015 +0200
@@ -33,7 +33,6 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-import jdk.internal.jvmci.code.AbstractAddress;
 import jdk.internal.jvmci.code.CodeCacheProvider;
 import jdk.internal.jvmci.code.CompilationResult;
 import jdk.internal.jvmci.code.CompilationResult.ConstantReference;
@@ -55,6 +54,7 @@
 import jdk.internal.jvmci.options.OptionType;
 import jdk.internal.jvmci.options.OptionValue;
 
+import com.oracle.graal.asm.AbstractAddress;
 import com.oracle.graal.asm.Assembler;
 import com.oracle.graal.asm.NumUtil;
 import com.oracle.graal.compiler.common.cfg.AbstractBlockBase;