From 1ef6ec40e150b7a75963eb2866cfde2381e72e81 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Mon, 15 Dec 2014 11:06:34 -0800 Subject: [PATCH] Move the generic arm memcmp.S into the generic directory. Change-Id: I48e4d14a0dcddbb246edbac6d0329619574ab44d --- libc/arch-arm/arm.mk | 1 - libc/arch-arm/cortex-a15/cortex-a15.mk | 1 + libc/arch-arm/cortex-a9/cortex-a9.mk | 1 + libc/arch-arm/denver/denver.mk | 1 + libc/arch-arm/{ => generic}/bionic/memcmp.S | 0 libc/arch-arm/generic/generic.mk | 1 + libc/arch-arm/krait/krait.mk | 1 + 7 files changed, 5 insertions(+), 1 deletion(-) rename libc/arch-arm/{ => generic}/bionic/memcmp.S (100%) diff --git a/libc/arch-arm/arm.mk b/libc/arch-arm/arm.mk index a4da9a6ce..5f0b1b344 100644 --- a/libc/arch-arm/arm.mk +++ b/libc/arch-arm/arm.mk @@ -58,7 +58,6 @@ libc_bionic_src_files_arm += \ arch-arm/bionic/__bionic_clone.S \ arch-arm/bionic/_exit_with_stack_teardown.S \ arch-arm/bionic/libgcc_compat.c \ - arch-arm/bionic/memcmp.S \ arch-arm/bionic/__restore.S \ arch-arm/bionic/setjmp.S \ arch-arm/bionic/syscall.S \ diff --git a/libc/arch-arm/cortex-a15/cortex-a15.mk b/libc/arch-arm/cortex-a15/cortex-a15.mk index f1abe3231..ec423c5be 100644 --- a/libc/arch-arm/cortex-a15/cortex-a15.mk +++ b/libc/arch-arm/cortex-a15/cortex-a15.mk @@ -1,4 +1,5 @@ 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 \ diff --git a/libc/arch-arm/cortex-a9/cortex-a9.mk b/libc/arch-arm/cortex-a9/cortex-a9.mk index c82db3b4d..e38c40ae9 100644 --- a/libc/arch-arm/cortex-a9/cortex-a9.mk +++ b/libc/arch-arm/cortex-a9/cortex-a9.mk @@ -1,4 +1,5 @@ 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 \ diff --git a/libc/arch-arm/denver/denver.mk b/libc/arch-arm/denver/denver.mk index 0bc52a27b..5fddf955a 100644 --- a/libc/arch-arm/denver/denver.mk +++ b/libc/arch-arm/denver/denver.mk @@ -1,4 +1,5 @@ libc_bionic_src_files_arm += \ + arch-arm/generic/bionic/memcmp.S \ arch-arm/denver/bionic/memcpy.S \ arch-arm/denver/bionic/memmove.S \ arch-arm/denver/bionic/memset.S \ diff --git a/libc/arch-arm/bionic/memcmp.S b/libc/arch-arm/generic/bionic/memcmp.S similarity index 100% rename from libc/arch-arm/bionic/memcmp.S rename to libc/arch-arm/generic/bionic/memcmp.S diff --git a/libc/arch-arm/generic/generic.mk b/libc/arch-arm/generic/generic.mk index 95be867cd..96ed949ec 100644 --- a/libc/arch-arm/generic/generic.mk +++ b/libc/arch-arm/generic/generic.mk @@ -1,4 +1,5 @@ libc_bionic_src_files_arm += \ + arch-arm/generic/bionic/memcmp.S \ arch-arm/generic/bionic/memcpy.S \ arch-arm/generic/bionic/memset.S \ arch-arm/generic/bionic/strcmp.S \ diff --git a/libc/arch-arm/krait/krait.mk b/libc/arch-arm/krait/krait.mk index 1bb7b0a07..450f4723e 100644 --- a/libc/arch-arm/krait/krait.mk +++ b/libc/arch-arm/krait/krait.mk @@ -1,4 +1,5 @@ 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 \