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

diff --git a/libc/arch-arm/denver/bionic/memcpy.S b/libc/arch-arm/denver/bionic/memcpy.S
index 5edee1e..f082542 100644
--- a/libc/arch-arm/denver/bionic/memcpy.S
+++ b/libc/arch-arm/denver/bionic/memcpy.S
@@ -65,14 +65,14 @@
         // arch. The code generated is exactly the same.
         .arch armv7-a
 
-ENTRY(__memcpy_denver)
+ENTRY(__memcpy)
         pld     [r1, #64]
         push    {r0, lr}
         .cfi_def_cfa_offset 8
         .cfi_rel_offset r0, 0
         .cfi_rel_offset lr, 4
-END(__memcpy_denver)
+END(__memcpy)
 
-#define MEMCPY_BASE         __memcpy_base_denver
-#define MEMCPY_BASE_ALIGNED __memcpy_base_aligned_denver
+#define MEMCPY_BASE         __memcpy_base
+#define MEMCPY_BASE_ALIGNED __memcpy_base_aligned
 #include "memcpy_base.S"