--- old/src/share/vm/runtime/thread.hpp	2015-01-21 10:23:26.743320174 -0500
+++ new/src/share/vm/runtime/thread.hpp	2015-01-21 10:23:26.493342314 -0500
@@ -1016,7 +1016,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