From ea9957a72a78d4f43dd8ddc1545fd800c0d15c9f Mon Sep 17 00:00:00 2001 From: Haibo Huang Date: Mon, 19 Nov 2018 11:00:32 -0800 Subject: Arm32 dynamic function dispatch Previous change was reverted in 9690b121e342676453c58f5940964350762085a0. This change added .arch directive to kryo/ to avoid invalid instruction error. Test: Run bionic unit test. Test: Use gdb to make sure the right function is selected. Test: Build previously failed target: make PRODUCT-sdk_phone_arm64-sdk Change-Id: I14de41851121fc1a0b38c98fda5eb844b6a9695c --- libc/arch-arm/cortex-a15/bionic/memcpy.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libc/arch-arm/cortex-a15/bionic/memcpy.S') diff --git a/libc/arch-arm/cortex-a15/bionic/memcpy.S b/libc/arch-arm/cortex-a15/bionic/memcpy.S index 0bab6ee7d..a9dfaff0f 100644 --- a/libc/arch-arm/cortex-a15/bionic/memcpy.S +++ b/libc/arch-arm/cortex-a15/bionic/memcpy.S @@ -64,7 +64,7 @@ .arch armv7-a // Prototype: void *memcpy (void *dst, const void *src, size_t count). -ENTRY(__memcpy) +ENTRY(__memcpy_a15) pld [r1, #64] push {r0, lr} .cfi_def_cfa_offset 8 @@ -72,4 +72,4 @@ ENTRY(__memcpy) .cfi_rel_offset lr, 4 #include "memcpy_base.S" -END(__memcpy) +END(__memcpy_a15) -- cgit v1.2.3