diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-03-31 14:15:30 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-03-31 14:15:30 -0700 |
| commit | 5ffedb22c856ae5731324b43832ab3f5309683f2 (patch) | |
| tree | c4b4d5c3cd96ca9c347d2ba9fed98c4d9be5e43e /libc/Android.mk | |
| parent | 62ac0dc457bddf7472f7be1e9895b1aee20f35cf (diff) | |
| parent | 8ab5b02b5f58d9b2f050a98b189284a3d6263d7b (diff) | |
| download | bionic-5ffedb22c856ae5731324b43832ab3f5309683f2.zip bionic-5ffedb22c856ae5731324b43832ab3f5309683f2.tar.gz bionic-5ffedb22c856ae5731324b43832ab3f5309683f2.tar.bz2 | |
merge from open-source master
Change-Id: I076e0df8656fdf58c229cc9a168cd6d8e16b6d8e
Diffstat (limited to 'libc/Android.mk')
| -rw-r--r-- | libc/Android.mk | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index d2e5e1f..d8cc721 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -175,7 +175,6 @@ libc_common_src_files := \ stdlib/tolower_.c \ stdlib/toupper_.c \ stdlib/wchar.c \ - string/bcopy.c \ string/index.c \ string/memccpy.c \ string/memchr.c \ @@ -186,7 +185,6 @@ libc_common_src_files := \ string/strcasestr.c \ string/strcat.c \ string/strchr.c \ - string/strcmp.c \ string/strcoll.c \ string/strcpy.c \ string/strcspn.c \ @@ -196,7 +194,6 @@ libc_common_src_files := \ string/strlcat.c \ string/strlcpy.c \ string/strncat.c \ - string/strncmp.c \ string/strncpy.c \ string/strndup.c \ string/strnlen.c \ @@ -313,6 +310,9 @@ libc_common_src_files += \ arch-arm/bionic/strlen.c.arm \ arch-arm/bionic/syscall.S \ string/memmove.c.arm \ + string/bcopy.c \ + string/strcmp.c \ + string/strncmp.c \ unistd/socketcalls.c # These files need to be arm so that gdbserver @@ -344,12 +344,15 @@ libc_common_src_files += \ arch-x86/bionic/_setjmp.S \ arch-x86/bionic/vfork.S \ arch-x86/bionic/syscall.S \ - arch-x86/string/bzero.S \ - arch-x86/string/memset.S \ - arch-x86/string/memcmp.S \ - arch-x86/string/memcpy.S \ + arch-x86/string/bcopy_wrapper.S \ + arch-x86/string/memcpy_wrapper.S \ + arch-x86/string/memmove_wrapper.S \ + arch-x86/string/bzero_wrapper.S \ + arch-x86/string/memcmp_wrapper.S \ + arch-x86/string/memset_wrapper.S \ + arch-x86/string/strcmp_wrapper.S \ + arch-x86/string/strncmp_wrapper.S \ arch-x86/string/strlen.S \ - string/memmove.c \ bionic/pthread.c \ bionic/pthread-timers.c \ bionic/ptrace.c @@ -381,6 +384,9 @@ libc_common_src_files += \ arch-sh/bionic/__set_tls.c \ arch-sh/bionic/__get_tls.c \ arch-sh/bionic/ffs.S \ + string/bcopy.c \ + string/strcmp.c \ + string/strncmp.c \ string/memcmp.c \ string/strlen.c \ bionic/eabi.c \ @@ -437,6 +443,10 @@ ifeq ($(TARGET_ARCH),arm) else # !arm ifeq ($(TARGET_ARCH),x86) libc_crt_target_cflags := -m32 + + # Enable recent IA friendly memory routines (such as for Atom) + # These will not work on the earlier x86 machines + libc_common_cflags += -mtune=i686 -DUSE_SSSE3 -DUSE_SSE2 endif # x86 endif # !arm |