diff options
| author | Christopher Ferris <cferris@google.com> | 2014-01-27 22:19:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-27 22:19:30 +0000 |
| commit | 8d12b4a0901df4ab708243b4cd36c19ac2002a50 (patch) | |
| tree | 902fd52072b81fe38d1e1bdf69daf0d1ec07a908 | |
| parent | 02d7fc05517997d49834ee48106c75ed4e661d57 (diff) | |
| parent | 4fe489665fef420210cd2e9ac1a682f8bfb950e9 (diff) | |
| download | system_core-8d12b4a0901df4ab708243b4cd36c19ac2002a50.zip system_core-8d12b4a0901df4ab708243b4cd36c19ac2002a50.tar.gz system_core-8d12b4a0901df4ab708243b4cd36c19ac2002a50.tar.bz2 | |
am 4fe48966: am 57c9b95b: am 39baa829: Merge "Get arm64 to compile."
* commit '4fe489665fef420210cd2e9ac1a682f8bfb950e9':
Get arm64 to compile.
| -rw-r--r-- | libbacktrace/Android.mk | 3 | ||||
| -rw-r--r-- | libbacktrace/UnwindCurrent.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
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 @@ 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 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 |