diff -r 4dcb647196fd -r 50369728b00e hotspot/src/share/vm/asm/assembler.inline.hpp
--- a/hotspot/src/share/vm/asm/assembler.inline.hpp	Fri Nov 21 08:00:31 2014 -0800
+++ b/hotspot/src/share/vm/asm/assembler.inline.hpp	Thu Dec 11 13:11:53 2014 -0800
@@ -42,5 +42,8 @@
 #ifdef TARGET_ARCH_ppc
 # include "assembler_ppc.inline.hpp"
 #endif
+#ifdef TARGET_ARCH_aarch64
+# include "assembler_aarch64.inline.hpp"
+#endif
 
 #endif // SHARE_VM_ASM_ASSEMBLER_INLINE_HPP