--- a/hotspot/src/share/vm/runtime/thread.hpp	Tue Jan 20 15:24:58 2015 -0800
+++ b/hotspot/src/share/vm/runtime/thread.hpp	Wed Jan 21 14:38:48 2015 -0800
@@ -1022,7 +1022,7 @@
   address last_Java_pc(void)                     { return _anchor.last_Java_pc(); }
 
   // Safepoint support
-#ifndef PPC64
+#if !(defined(PPC64) || defined(AARCH64))
   JavaThreadState thread_state() const           { return _thread_state; }
   void set_thread_state(JavaThreadState s)       { _thread_state = s;    }
 #else