Index: lib/arm/aeabi_memcmp.S =================================================================== --- lib/arm/aeabi_memcmp.S +++ lib/arm/aeabi_memcmp.S @@ -11,9 +11,11 @@ // void __aeabi_memcmp(void *dest, void *src, size_t n) { memcmp(dest, src, n); } +#ifndef __ANDROID__ .align 2 DEFINE_COMPILERRT_FUNCTION(__aeabi_memcmp) b memcmp DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memcmp4, __aeabi_memcmp) DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memcmp8, __aeabi_memcmp) +#endif Index: lib/arm/aeabi_memcpy.S =================================================================== --- lib/arm/aeabi_memcpy.S +++ lib/arm/aeabi_memcpy.S @@ -11,9 +11,11 @@ // void __aeabi_memcpy(void *dest, void *src, size_t n) { memcpy(dest, src, n); } +#ifndef __ANDROID__ .align 2 DEFINE_COMPILERRT_FUNCTION(__aeabi_memcpy) b memcpy DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memcpy4, __aeabi_memcpy) DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memcpy8, __aeabi_memcpy) +#endif Index: lib/arm/aeabi_memmove.S =================================================================== --- lib/arm/aeabi_memmove.S +++ lib/arm/aeabi_memmove.S @@ -11,9 +11,11 @@ // void __aeabi_memmove(void *dest, void *src, size_t n) { memmove(dest, src, n); } +#ifndef __ANDROID__ .align 2 DEFINE_COMPILERRT_FUNCTION(__aeabi_memmove) b memmove DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memmove4, __aeabi_memmove) DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memmove8, __aeabi_memmove) +#endif Index: lib/arm/aeabi_memset.S =================================================================== --- lib/arm/aeabi_memset.S +++ lib/arm/aeabi_memset.S @@ -12,6 +12,7 @@ // void __aeabi_memset(void *dest, size_t n, int c) { memset(dest, c, n); } // void __aeabi_memclr(void *dest, size_t n) { __aeabi_memset(dest, n, 0); } +#ifndef __ANDROID__ .align 2 DEFINE_COMPILERRT_FUNCTION(__aeabi_memset) mov r3, r1 @@ -29,4 +30,4 @@ DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memclr4, __aeabi_memclr) DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memclr8, __aeabi_memclr) - +#endif