diff --git a/releasenotes.md b/releasenotes.md index ad0e0d761..36405d6f2 100644 --- a/releasenotes.md +++ b/releasenotes.md @@ -26,6 +26,7 @@ - Fixes methodsof to pick up all sorts of extension methods. #2192 - `--lsp` sometimes does not emit end tag #2194. - Improve Android termux detection. +- Update Android ABI. ### Stdlib changes - Deprecate `String.is_zstr` and `String.quick_zstr` #2188. diff --git a/src/compiler/abi/c_abi_aarch64.c b/src/compiler/abi/c_abi_aarch64.c index ad351af71..ae99fed09 100644 --- a/src/compiler/abi/c_abi_aarch64.c +++ b/src/compiler/abi/c_abi_aarch64.c @@ -61,7 +61,7 @@ ABIArgInfo *aarch64_coerce_illegal_vector(Type *type) TypeSize size = type_size(type); // CLANG: Android promotes char[<2>] to ushort, not uint - if (compiler.platform.environment_type == ENV_TYPE_ANDROID && size <= 2) + if ((compiler.platform.environment_type == ENV_TYPE_ANDROID || compiler.platform.os == OS_TYPE_ANDROID) && size <= 2) { return abi_arg_new_direct_coerce_type(type_ushort); }