diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-11-08 16:09:17 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-11-08 16:09:17 -0800 |
| commit | 10be95cffc7f2b02d8baac55a9cf1b16d8afbadb (patch) | |
| tree | 372359d357eb01bd7c3160cb20339c20c317804f /libc/Android.mk | |
| parent | 47c5e30b61bad28731e4acff2d690a4207801f27 (diff) | |
| parent | ad13c57298e57d33c130fb03a2c6494da573408c (diff) | |
| download | bionic-10be95cffc7f2b02d8baac55a9cf1b16d8afbadb.zip bionic-10be95cffc7f2b02d8baac55a9cf1b16d8afbadb.tar.gz bionic-10be95cffc7f2b02d8baac55a9cf1b16d8afbadb.tar.bz2 | |
merge from open-source master
Diffstat (limited to 'libc/Android.mk')
| -rw-r--r-- | libc/Android.mk | 39 |
1 files changed, 36 insertions, 3 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index 5718d18..bafc118 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -52,6 +52,7 @@ libc_common_src_files := \ unistd/siginterrupt.c \ unistd/siglist.c \ unistd/signal.c \ + unistd/signame.c \ unistd/sigsetmask.c \ unistd/sigsuspend.c \ unistd/sigwait.c \ @@ -175,7 +176,6 @@ libc_common_src_files := \ string/memccpy.c \ string/memchr.c \ string/memmem.c \ - string/memmove.c.arm \ string/memrchr.c \ string/memswap.c \ string/strcasecmp.c \ @@ -259,7 +259,7 @@ libc_common_src_files := \ netbsd/resolv/res_mkquery.c \ netbsd/resolv/res_query.c \ netbsd/resolv/res_send.c \ - netbsd/resolv/res_state.c.arm \ + netbsd/resolv/res_state.c \ netbsd/resolv/res_cache.c \ netbsd/net/nsdispatch.c \ netbsd/net/getaddrinfo.c \ @@ -298,6 +298,7 @@ libc_common_src_files += \ arch-arm/bionic/sigsetjmp.S \ arch-arm/bionic/strlen.c.arm \ arch-arm/bionic/syscall.S \ + string/memmove.c.arm \ unistd/socketcalls.c # These files need to be arm so that gdbserver @@ -333,6 +334,7 @@ libc_common_src_files += \ arch-x86/string/memcmp.S \ arch-x86/string/memcpy.S \ arch-x86/string/strlen.S \ + string/memmove.c \ bionic/pthread.c \ bionic/pthread-timers.c \ bionic/ptrace.c @@ -342,7 +344,38 @@ libc_arch_static_src_files := \ arch-x86/bionic/dl_iterate_phdr_static.c libc_arch_dynamic_src_files := -endif # x86 +else # !x86 + +ifeq ($(TARGET_ARCH),sh) +libc_common_src_files += \ + arch-sh/bionic/__get_pc.S \ + arch-sh/bionic/__get_sp.S \ + arch-sh/bionic/_exit_with_stack_teardown.S \ + arch-sh/bionic/_setjmp.S \ + arch-sh/bionic/atomics_sh.c \ + arch-sh/bionic/atomic_cmpxchg.S \ + arch-sh/bionic/clone.S \ + arch-sh/bionic/pipe.S \ + arch-sh/bionic/memcpy.S \ + arch-sh/bionic/memset.S \ + arch-sh/bionic/bzero.S \ + arch-sh/bionic/setjmp.S \ + arch-sh/bionic/sigsetjmp.S \ + arch-sh/bionic/syscall.S \ + arch-sh/bionic/memmove.S \ + arch-sh/bionic/__set_tls.c \ + arch-sh/bionic/__get_tls.c \ + arch-sh/bionic/ffs.S \ + string/memcmp.c \ + string/strlen.c \ + bionic/eabi.c \ + bionic/pthread.c \ + bionic/pthread-timers.c \ + bionic/ptrace.c \ + unistd/socketcalls.c +endif # sh + +endif # !x86 endif # !arm # Define some common cflags |