merge from open-source master

[android-sdk/platform-bionic.git] / libc / Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index 7f50390273dfb0cf2bfda544293e5d60daa1de56..d8cc721ca4a90078d31c96c477a0a5896c4687f2 100644 (file)
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -26,6 +26,7 @@ libc_common_src_files := \
        unistd/initgroups.c \
        unistd/isatty.c \
        unistd/issetugid.c \
+       unistd/killpg.c \
        unistd/lseek64.c \
        unistd/mmap.c \
        unistd/nice.c \
@@ -46,7 +47,10 @@ libc_common_src_files := \
        unistd/sbrk.c \
        unistd/send.c \
        unistd/setegid.c \
+       unistd/setuid.c \
        unistd/seteuid.c \
+       unistd/setreuid.c \
+       unistd/setresuid.c \
        unistd/setpgrp.c \
        unistd/sigblock.c \
        unistd/siginterrupt.c \
@@ -171,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 \
@@ -182,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 \
@@ -192,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 \
@@ -218,14 +219,19 @@ libc_common_src_files := \
        bionic/__errno.c \
        bionic/__set_errno.c \
        bionic/_rand48.c \
+       bionic/cpuacct.c \
        bionic/arc4random.c \
        bionic/basename.c \
        bionic/basename_r.c \
+       bionic/clearenv.c \
        bionic/dirname.c \
        bionic/dirname_r.c \
        bionic/drand48.c \
        bionic/erand48.c \
+       bionic/err.c \
+       bionic/fdprintf.c \
        bionic/fork.c \
+       bionic/fts.c \
        bionic/if_nametoindex.c \
        bionic/if_indextoname.c \
        bionic/ioctl.c \
@@ -273,13 +279,18 @@ libc_common_src_files := \
        netbsd/nameser/ns_ttl.c \
        netbsd/nameser/ns_netint.c \
        netbsd/nameser/ns_print.c \
-       netbsd/nameser/ns_samedomain.c
+       netbsd/nameser/ns_samedomain.c \
+       regex/regcomp.c \
+       regex/regerror.c \
+       regex/regexec.c \
+       regex/regfree.c \
 
 # Architecture specific source files go here
 # =========================================================
 ifeq ($(TARGET_ARCH),arm)
 libc_common_src_files += \
        bionic/eabi.c \
+       bionic/bionic_clone.c \
        arch-arm/bionic/__get_pc.S \
        arch-arm/bionic/__get_sp.S \
        arch-arm/bionic/_exit_with_stack_teardown.S \
@@ -299,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
@@ -329,12 +343,16 @@ libc_common_src_files += \
        arch-x86/bionic/setjmp.S \
        arch-x86/bionic/_setjmp.S \
        arch-x86/bionic/vfork.S \
-       arch-x86/string/bzero.S \
-       arch-x86/string/memset.S \
-       arch-x86/string/memcmp.S \
-       arch-x86/string/memcpy.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.S \
-       string/memmove.c \
        bionic/pthread.c \
        bionic/pthread-timers.c \
        bionic/ptrace.c
@@ -366,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 \
@@ -391,7 +412,16 @@ libc_common_cflags := \
                -DNEED_PSELECT=1                \
                -DINET6 \
                -I$(LOCAL_PATH)/private \
-               -DUSE_DL_PREFIX
+               -DUSE_DL_PREFIX \
+               -DPOSIX_MISTAKE
+
+# these macro definitions are required to implement the
+# 'timezone' and 'daylight' global variables, as well as
+# properly update the 'tm_gmtoff' field in 'struct tm'.
+#
+libc_common_cflags += \
+    -DTM_GMTOFF=tm_gmtoff \
+    -DUSG_COMPAT=1
 
 ifeq ($(strip $(DEBUG_BIONIC_LIBC)),true)
   libc_common_cflags += -DDEBUG
@@ -413,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