--- old/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/ELFMacroAssembler.java	2018-03-23 16:36:08.641713016 +0000
+++ new/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/ELFMacroAssembler.java	2018-03-23 16:36:08.011775303 +0000
@@ -25,8 +25,10 @@
 
 import jdk.tools.jaotc.StubInformation;
 import jdk.tools.jaotc.amd64.AMD64ELFMacroAssembler;
+import jdk.tools.jaotc.aarch64.AArch64ELFMacroAssembler;
 
 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,7 +37,9 @@
     public static ELFMacroAssembler getELFMacroAssembler(TargetDescription target) {
         Architecture architecture = target.arch;
         if (architecture instanceof AMD64) {
-            return new AMD64ELFMacroAssembler(target);
+                return new AMD64ELFMacroAssembler(target);
+        } else if (architecture instanceof AArch64) {
+            return new AArch64ELFMacroAssembler(target);
         } else {
             throw new InternalError("Unsupported architecture " + architecture);
         }