--- old/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/InstructionDecoder.java	2018-03-23 16:36:09.921586465 +0000
+++ new/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/InstructionDecoder.java	2018-03-23 16:36:09.291648752 +0000
@@ -24,8 +24,10 @@
 package jdk.tools.jaotc;
 
 import jdk.tools.jaotc.amd64.AMD64InstructionDecoder;
+import jdk.tools.jaotc.aarch64.AArch64InstructionDecoder;
 
 import jdk.vm.ci.amd64.AMD64;
+import jdk.vm.ci.aarch64.AArch64;
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.TargetDescription;
 
@@ -35,6 +37,8 @@
         Architecture architecture = target.arch;
         if (architecture instanceof AMD64) {
             return new AMD64InstructionDecoder(target);
+        } else if (architecture instanceof AArch64) {
+            return new AArch64InstructionDecoder(target);
         } else {
             throw new InternalError("Unsupported architecture " + architecture);
         }