From 41efc92e35d1922e246230bac72da0054b3c6db3 Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Thu, 2 Apr 2015 15:47:35 -0700 Subject: [PATCH] Use assembly memmove for all arm32 processors. Bug: 15110993 Change-Id: Ia3dcd6b8c4032f8c72b6f2e628b635ce99667c09 --- libc/arch-arm/cortex-a15/cortex-a15.mk | 8 +++++--- libc/arch-arm/cortex-a9/cortex-a9.mk | 8 +++++--- libc/arch-arm/krait/krait.mk | 8 +++++--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/libc/arch-arm/cortex-a15/cortex-a15.mk b/libc/arch-arm/cortex-a15/cortex-a15.mk index cc502cf29..6fa327022 100644 --- a/libc/arch-arm/cortex-a15/cortex-a15.mk +++ b/libc/arch-arm/cortex-a15/cortex-a15.mk @@ -1,5 +1,4 @@ libc_bionic_src_files_arm += \ - arch-arm/generic/bionic/memcmp.S \ arch-arm/cortex-a15/bionic/memcpy.S \ arch-arm/cortex-a15/bionic/memset.S \ arch-arm/cortex-a15/bionic/stpcpy.S \ @@ -10,5 +9,8 @@ libc_bionic_src_files_arm += \ arch-arm/cortex-a15/bionic/__strcpy_chk.S \ arch-arm/cortex-a15/bionic/strlen.S \ -libc_openbsd_src_files_arm += \ - upstream-openbsd/lib/libc/string/memmove.c \ +libc_bionic_src_files_arm += \ + arch-arm/generic/bionic/memcmp.S \ + +libc_bionic_src_files_arm += \ + arch-arm/denver/bionic/memmove.S \ diff --git a/libc/arch-arm/cortex-a9/cortex-a9.mk b/libc/arch-arm/cortex-a9/cortex-a9.mk index 7570567a8..7b38de15c 100644 --- a/libc/arch-arm/cortex-a9/cortex-a9.mk +++ b/libc/arch-arm/cortex-a9/cortex-a9.mk @@ -1,5 +1,4 @@ libc_bionic_src_files_arm += \ - arch-arm/generic/bionic/memcmp.S \ arch-arm/cortex-a9/bionic/memcpy.S \ arch-arm/cortex-a9/bionic/memset.S \ arch-arm/cortex-a9/bionic/stpcpy.S \ @@ -10,5 +9,8 @@ libc_bionic_src_files_arm += \ arch-arm/cortex-a9/bionic/__strcpy_chk.S \ arch-arm/cortex-a9/bionic/strlen.S \ -libc_openbsd_src_files_arm += \ - upstream-openbsd/lib/libc/string/memmove.c \ +libc_bionic_src_files_arm += \ + arch-arm/generic/bionic/memcmp.S \ + +libc_bionic_src_files_arm += \ + arch-arm/denver/bionic/memmove.S \ diff --git a/libc/arch-arm/krait/krait.mk b/libc/arch-arm/krait/krait.mk index 8bd5e8bff..88b4d663c 100644 --- a/libc/arch-arm/krait/krait.mk +++ b/libc/arch-arm/krait/krait.mk @@ -1,5 +1,4 @@ libc_bionic_src_files_arm += \ - arch-arm/generic/bionic/memcmp.S \ arch-arm/krait/bionic/memcpy.S \ arch-arm/krait/bionic/memset.S \ arch-arm/krait/bionic/strcmp.S \ @@ -13,5 +12,8 @@ libc_bionic_src_files_arm += \ arch-arm/cortex-a15/bionic/strcpy.S \ arch-arm/cortex-a15/bionic/strlen.S \ -libc_openbsd_src_files_arm += \ - upstream-openbsd/lib/libc/string/memmove.c \ +libc_bionic_src_files_arm += \ + arch-arm/generic/bionic/memcmp.S \ + +libc_bionic_src_files_arm += \ + arch-arm/denver/bionic/memmove.S \ -- 2.11.0