A64: Fix some compile errors when building for Android.

src/platform-linux.cc

Index: src/platform-linux.cc
diff --git a/src/platform-linux.cc b/src/platform-linux.cc
index a9aaf7803b8dd2e2295057146447c69d6cda764d..99a15939c2fb0fa3b389935b37de412fb7b8b4b3 100644
--- a/src/platform-linux.cc
+++ b/src/platform-linux.cc
@@ -58,7 +58,8 @@
 // GLibc on ARM defines mcontext_t has a typedef for 'struct sigcontext'.
 // Old versions of the C library <signal.h> didn't define the type.
 #if defined(__ANDROID__) && !defined(__BIONIC_HAVE_UCONTEXT_T) && \
-    defined(__arm__) && !defined(__BIONIC_HAVE_STRUCT_SIGCONTEXT)
+    (defined(__arm__) || defined(__aarch64__)) && \
+    !defined(__BIONIC_HAVE_STRUCT_SIGCONTEXT)
 #include <asm/sigcontext.h>
 #endif
 
@@ -442,6 +443,8 @@ void OS::DebugBreak() {
   asm("hlt 0");
 #elif defined(__arm__) || defined(__thumb__)
   asm("bkpt 0");
+#elif defined(__aarch64__)

[Rodolph Perfetta (ARM), 2014/01/30 11:17:15]

there is already a __aarch64__ case 2 lines up, but brk is probably a better
choice.

[rmcilroy, 2014/01/30 18:16:42]

Ahh, missed the previous one.  Removed it and kept this one.

+  asm("brk 0");
 #elif defined(__mips__)
   asm("break");
 #elif defined(__native_client__)