diff options
| author | Elliott Hughes <enh@google.com> | 2013-02-14 00:49:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-02-14 00:49:47 +0000 |
| commit | 6b97c7dc0376577276abbdacc52e5cc11cf8a7fd (patch) | |
| tree | cd89790093a1ed8c24e3941a8d79b9f648c5481c /libc | |
| parent | 97f2ec50a7993d2db7ef4511a251e6823f5dba10 (diff) | |
| parent | d2547040a13fe1bce31a60df35d4953c596a3db0 (diff) | |
| download | bionic-6b97c7dc0376577276abbdacc52e5cc11cf8a7fd.zip bionic-6b97c7dc0376577276abbdacc52e5cc11cf8a7fd.tar.gz bionic-6b97c7dc0376577276abbdacc52e5cc11cf8a7fd.tar.bz2 | |
Merge "ffs was not being built for x86."
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/Android.mk | 51 | ||||
| -rw-r--r-- | libc/arch-x86/string/ffs.S (renamed from libc/arch-x86/string/fss.S) | 0 |
2 files changed, 26 insertions, 25 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index 606fda2..4130e25 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -408,31 +408,32 @@ endif # arm ifeq ($(TARGET_ARCH),x86) libc_common_src_files += \ - arch-x86/bionic/__get_sp.S \ - arch-x86/bionic/__get_tls.c \ - arch-x86/bionic/__set_tls.c \ - arch-x86/bionic/clone.S \ - arch-x86/bionic/_exit_with_stack_teardown.S \ - arch-x86/bionic/futex_x86.S \ - arch-x86/bionic/setjmp.S \ - arch-x86/bionic/_setjmp.S \ - arch-x86/bionic/sigsetjmp.S \ - arch-x86/bionic/vfork.S \ - arch-x86/bionic/syscall.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_wrapper.S \ - string/strcpy.c \ - bionic/pthread-atfork.c \ - bionic/pthread-rwlocks.c \ - bionic/pthread-timers.c \ - bionic/ptrace.c + arch-x86/bionic/clone.S \ + arch-x86/bionic/_exit_with_stack_teardown.S \ + arch-x86/bionic/futex_x86.S \ + arch-x86/bionic/__get_sp.S \ + arch-x86/bionic/__get_tls.c \ + arch-x86/bionic/_setjmp.S \ + arch-x86/bionic/setjmp.S \ + arch-x86/bionic/__set_tls.c \ + arch-x86/bionic/sigsetjmp.S \ + arch-x86/bionic/syscall.S \ + arch-x86/bionic/vfork.S \ + arch-x86/string/bcopy_wrapper.S \ + arch-x86/string/bzero_wrapper.S \ + arch-x86/string/ffs.S \ + arch-x86/string/memcmp_wrapper.S \ + arch-x86/string/memcpy_wrapper.S \ + arch-x86/string/memmove_wrapper.S \ + arch-x86/string/memset_wrapper.S \ + arch-x86/string/strcmp_wrapper.S \ + arch-x86/string/strlen_wrapper.S \ + arch-x86/string/strncmp_wrapper.S \ + bionic/pthread-atfork.c \ + bionic/pthread-rwlocks.c \ + bionic/pthread-timers.c \ + bionic/ptrace.c \ + string/strcpy.c \ libc_static_common_src_files += \ bionic/pthread.c \ diff --git a/libc/arch-x86/string/fss.S b/libc/arch-x86/string/ffs.S index d819306..d819306 100644 --- a/libc/arch-x86/string/fss.S +++ b/libc/arch-x86/string/ffs.S |