commit 9690b121e342676453c58f5940964350762085a0
author Izabela Orlowska <imorlowska@google.com> Mon Nov 19 14:14:41 2018 +0000
committer Izabela Orlowska <imorlowska@google.com> Mon Nov 19 14:14:41 2018 +0000
tree 0679a4121379514b370e3c73c1842170af2205a0
parent ce4ff9c44de8213a55c3712da17c5eab8f1247bc

Revert "Arm32 dynamic function dispatch"

This reverts commit ce4ff9c44de8213a55c3712da17c5eab8f1247bc.

Reason for revert: broke master in ab/5138164 target sdk_phone_armv7-sdk

Change-Id: Ia4b0c7e6117a37df694509078116963f41d7865e

libc/arch-arm/krait/bionic/memset.S

diff --git a/libc/arch-arm/krait/bionic/memset.S b/libc/arch-arm/krait/bionic/memset.S
index 675ab53..228942c 100644
--- a/libc/arch-arm/krait/bionic/memset.S
+++ b/libc/arch-arm/krait/bionic/memset.S
@@ -37,7 +37,7 @@
     .fpu    neon
     .syntax unified
 
-ENTRY(__memset_chk_krait)
+ENTRY(__memset_chk)
         cmp         r2, r3
         bls         memset
 
@@ -47,10 +47,10 @@
         .cfi_rel_offset lr, 0
 
         bl          __memset_chk_fail
-END(__memset_chk_krait)
+END(__memset_chk)
 
 /* memset() returns its first argument.  */
-ENTRY(memset_krait)
+ENTRY(memset)
         mov         r3, r0
         vdup.8      q0, r1
 
@@ -82,4 +82,4 @@
         strbcs      r1, [r3], #1
         strbcs      r1, [r3], #1
         bx          lr
-END(memset_krait)
+END(memset)