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

* commit '4fe489665fef420210cd2e9ac1a682f8bfb950e9':
  Get arm64 to compile.
This commit is contained in:
Christopher Ferris 2014-01-27 22:19:30 +00:00 committed by Android Git Automerger
commit 8d12b4a090
2 changed files with 2 additions and 3 deletions

View file

@ -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)))

View file

@ -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