am f83148af: am 0c17099a: Merge "Fix __errno for LP64 and clean up __get_tls."

* commit 'f83148af74704c574ad1bf60082f2f56bcb29706': Fix __errno for LP64 and clean up __get_tls.
2013-10-09 13:52:56 -07:00
parent 7c98d1304d f83148af74
commit ac045c32d0
14 changed files with 56 additions and 104 deletions
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -186,6 +186,7 @@ ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm mips x86))
 libc_common_src_files += \
    bionic/fcntl.c \
    bionic/fstatfs.c \
+    bionic/__get_tls.cpp \
    bionic/lseek64.c \
    bionic/sigsuspend.c \
    bionic/statfs.c \
@@ -218,7 +219,7 @@ libc_bionic_src_files := \
    bionic/assert.cpp \
    bionic/brk.cpp \
    bionic/dirent.cpp \
-    bionic/__errno.c \
+    bionic/__errno.cpp \
    bionic/eventfd_read.cpp \
    bionic/eventfd_write.cpp \
    bionic/futimens.cpp \