diff options
| author | Elliott Hughes <enh@google.com> | 2014-12-15 19:32:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-15 19:32:42 +0000 |
| commit | 16ea2790a84b1e65dc1e485c3ec494de787cc490 (patch) | |
| tree | b371db8fde14c8d5fddac126d2081e6233ce3eac /libc | |
| parent | ad01c9831918ecae815db2406022ef69e74f6e6d (diff) | |
| parent | 1ef6ec40e150b7a75963eb2866cfde2381e72e81 (diff) | |
| download | bionic-16ea2790a84b1e65dc1e485c3ec494de787cc490.zip bionic-16ea2790a84b1e65dc1e485c3ec494de787cc490.tar.gz bionic-16ea2790a84b1e65dc1e485c3ec494de787cc490.tar.bz2 | |
Merge "Move the generic arm memcmp.S into the generic directory."
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/arch-arm/arm.mk | 1 | ||||
| -rw-r--r-- | libc/arch-arm/cortex-a15/cortex-a15.mk | 1 | ||||
| -rw-r--r-- | libc/arch-arm/cortex-a9/cortex-a9.mk | 1 | ||||
| -rw-r--r-- | libc/arch-arm/denver/denver.mk | 1 | ||||
| -rw-r--r-- | libc/arch-arm/generic/bionic/memcmp.S (renamed from libc/arch-arm/bionic/memcmp.S) | 0 | ||||
| -rw-r--r-- | libc/arch-arm/generic/generic.mk | 1 | ||||
| -rw-r--r-- | libc/arch-arm/krait/krait.mk | 1 |
7 files changed, 5 insertions, 1 deletions
diff --git a/libc/arch-arm/arm.mk b/libc/arch-arm/arm.mk index a4da9a6..5f0b1b3 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 f1abe32..ec423c5 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 c82db3b..e38c40a 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 0bc52a2..5fddf95 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 index 70a2a58..70a2a58 100644 --- a/libc/arch-arm/bionic/memcmp.S +++ b/libc/arch-arm/generic/bionic/memcmp.S diff --git a/libc/arch-arm/generic/generic.mk b/libc/arch-arm/generic/generic.mk index 95be867..96ed949 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 1bb7b0a..450f472 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 \ |