commit 56e73359021697d898ba8d6243776bc94854f765
author Christopher Ferris <cferris@google.com> Mon Jan 27 22:23:41 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 27 22:23:41 2014 +0000
tree 72c32d6f9585ebd3c7fa05ede7cb682dbede9915
parent dd200e9d2f7d6e8cb4a414f76fcacd166f7b8059
parent 8d12b4a0901df4ab708243b4cd36c19ac2002a50

am 8d12b4a0: am 4fe48966: am 57c9b95b: am 39baa829: Merge "Get arm64 to compile."

* commit '8d12b4a0901df4ab708243b4cd36c19ac2002a50':
  Get arm64 to compile.

libbacktrace/Android.mk

diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk
index 9c52ad7..f23eefd 100644
--- a/libbacktrace/Android.mk
+++ b/libbacktrace/Android.mk
@@ -23,8 +23,7 @@
 	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)))
 

libbacktrace/UnwindCurrent.cpp

diff --git a/libbacktrace/UnwindCurrent.cpp b/libbacktrace/UnwindCurrent.cpp
index 747eb21..d1195ee 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