| Index: runtime/vm/os_android.cc
|
| ===================================================================
|
| --- runtime/vm/os_android.cc (revision 39843)
|
| +++ runtime/vm/os_android.cc (working copy)
|
| @@ -205,7 +205,8 @@
|
| // TODO(5411554): May need to hoist these architecture dependent code
|
| // into a architecture specific file e.g: os_ia32_linux.cc
|
| intptr_t OS::ActivationFrameAlignment() {
|
| -#if defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64)
|
| +#if defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64) || \
|
| + defined(TARGET_ARCH_ARM64)
|
| const int kMinimumAlignment = 16;
|
| #elif defined(TARGET_ARCH_ARM)
|
| const int kMinimumAlignment = 8;
|
| @@ -223,7 +224,8 @@
|
|
|
|
|
| intptr_t OS::PreferredCodeAlignment() {
|
| -#if defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64)
|
| +#if defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64) || \
|
| + defined(TARGET_ARCH_ARM64)
|
| const int kMinimumAlignment = 16;
|
| #elif defined(TARGET_ARCH_ARM)
|
| const int kMinimumAlignment = 16;
|
|
|