commit ea9957a72a78d4f43dd8ddc1545fd800c0d15c9f
author Haibo Huang <hhb@google.com> Mon Nov 19 11:00:32 2018 -0800
committer Haibo Huang <hhb@google.com> Mon Nov 26 20:00:55 2018 +0000
tree e6875688c7da7c8ca1083623e78205af81e92cf5
parent 9ab3e4015d381d7309d54b630abebab2bbae1856

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/krait/bionic/memcpy.S

diff --git a/libc/arch-arm/krait/bionic/memcpy.S b/libc/arch-arm/krait/bionic/memcpy.S
index 49fd040..6618b3a 100644
--- a/libc/arch-arm/krait/bionic/memcpy.S
+++ b/libc/arch-arm/krait/bionic/memcpy.S
@@ -42,7 +42,7 @@
         .thumb
         .thumb_func
 
-ENTRY(__memcpy)
+ENTRY(__memcpy_krait)
         pld     [r1, #64]
         stmfd   sp!, {r0, lr}
         .cfi_adjust_cfa_offset 8
@@ -50,4 +50,4 @@
         .cfi_rel_offset lr, 4
 
 #include "memcpy_base.S"
-END(__memcpy)
+END(__memcpy_krait)