From edbe3b4b56a02e1c56f95a8ab05afb4135339cc8 Mon Sep 17 00:00:00 2001
From: Christopher Ferris <cferris@google.com>
Date: Mon, 27 Jan 2014 10:50:58 -0800
Subject: [PATCH] Get arm64 to compile.

Change-Id: Ica021aa134388fe7069a5de5df8036ecf0d570f8
---
 libbacktrace/Android.mk        | 3 +--
 libbacktrace/UnwindCurrent.cpp | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk
index 9c52ad742..f23eefdd7 100644
--- a/libbacktrace/Android.mk
+++ b/libbacktrace/Android.mk
@@ -23,8 +23,7 @@ common_shared_libs := \
 	liblog \
 
 # To enable using libunwind on each arch, add it to this list.
-libunwind_architectures :=
-#libunwind_architectures := arm
+libunwind_architectures := arm64
 
 ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),$(libunwind_architectures)))
 
diff --git a/libbacktrace/UnwindCurrent.cpp b/libbacktrace/UnwindCurrent.cpp
index 747eb21b6..d1195ee5f 100644
--- a/libbacktrace/UnwindCurrent.cpp
+++ b/libbacktrace/UnwindCurrent.cpp
@@ -43,7 +43,7 @@
   #include <asm/sigcontext.h>
   #include <asm/ucontext.h>
   typedef struct ucontext ucontext_t;
-#elif !defined(__mips__)
+#elif !defined(__mips__) && !defined(__aarch64__)
   #error Unsupported architecture.
 #endif