diff options
author | Ryan Prichard <rprichard@google.com> | 2017-10-04 11:51:00 -0700 |
---|---|---|
committer | Ryan Prichard <rprichard@google.com> | 2017-10-04 12:04:44 -0700 |
commit | cfa38b4ac01d83bc327319cca9b7eeb5491ca21e (patch) | |
tree | 6f4a271436826865d39fe82e01173349de2d21e8 /sources | |
parent | cce70b95da83aeb090b116d8d100347881f4a06c (diff) | |
download | ndk-cfa38b4ac01d83bc327319cca9b7eeb5491ca21e.tar.gz |
Configure macOS ndk-stack for arm64 rather than arm32
I verified that arm32 "objdump -x" and arm64 "objdump -x" output the same
thing for libc.a across various archs. I think libbfd is configured for
a particular triple and isn't generally expected to work with binaries of
a different architecture, so this fix isn't ideal, but it's also trivial.
Bug: https://github.com/android-ndk/ndk/issues/20
Test: run ndk-stack manually on traces of various archs
Change-Id: I2c4783ef2f7fec2af0f1a7671c62a47309f7e819
Diffstat (limited to 'sources')
-rwxr-xr-x | sources/host-tools/ndk-stack/build-ndk-stack.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/host-tools/ndk-stack/build-ndk-stack.sh b/sources/host-tools/ndk-stack/build-ndk-stack.sh index 61a93e65d..f823e11a2 100755 --- a/sources/host-tools/ndk-stack/build-ndk-stack.sh +++ b/sources/host-tools/ndk-stack/build-ndk-stack.sh @@ -73,7 +73,7 @@ if [ "$HOST_OS" != "darwin" -a "$DARWIN" != "yes" ]; then else # In darwin libbfd has to be built with some *linux* target or it won't understand ELF # Disable -Werror because binutils uses deprecated functions (e.g. sbrk). - EXTRA_CONFIG="-target=arm-linux-androideabi --disable-werror" + EXTRA_CONFIG="-target=aarch64-linux-android --disable-werror" fi if [ "$MINGW" = "yes" ]; then |