summaryrefslogtreecommitdiffstats
path: root/libc/Android.mk
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-02-08 15:46:37 -0800
committerElliott Hughes <enh@google.com>2013-02-11 12:00:48 -0800
commitad59322ae432d11ff36dcf046016af8cfe45fbe4 (patch)
tree04ea728ddd656079ca4b9f228b32c371370be947 /libc/Android.mk
parent9a9bb243b50be5e3910b8edad72327bc216e72d0 (diff)
downloadbionic-ad59322ae432d11ff36dcf046016af8cfe45fbe4.zip
bionic-ad59322ae432d11ff36dcf046016af8cfe45fbe4.tar.gz
bionic-ad59322ae432d11ff36dcf046016af8cfe45fbe4.tar.bz2
Pull the pthread_key_t functions out of pthread.c.
This was originally motivated by noticing that we were setting the wrong bits for the well-known tls entries. That was a harmless bug because none of the well-known tls entries has a destructor, but it's best not to leave land mines lying around. Also add some missing POSIX constants, a new test, and fix pthread_key_create's return value when we hit the limit. Change-Id: Ife26ea2f4b40865308e8410ec803b20bcc3e0ed1
Diffstat (limited to 'libc/Android.mk')
-rw-r--r--libc/Android.mk9
1 files changed, 6 insertions, 3 deletions
diff --git a/libc/Android.mk b/libc/Android.mk
index c7828cf..d21878a 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -406,7 +406,8 @@ libc_common_src_files += \
bionic/ptrace.c.arm
libc_static_common_src_files += \
- bionic/pthread.c.arm \
+ bionic/pthread.c.arm \
+ bionic/pthread_key.cpp.arm \
# these are used by the static and dynamic versions of the libc
# respectively
@@ -446,7 +447,8 @@ libc_common_src_files += \
bionic/ptrace.c
libc_static_common_src_files += \
- bionic/pthread.c \
+ bionic/pthread.c \
+ bionic/pthread_key.cpp \
libc_arch_static_src_files := \
bionic/dl_iterate_phdr_static.c
@@ -492,7 +494,8 @@ libc_common_src_files += \
bionic/ptrace.c
libc_static_common_src_files += \
- bionic/pthread.c
+ bionic/pthread.c
+ bionic/pthread_key.cpp \
libc_arch_static_src_files := \
bionic/dl_iterate_phdr_static.c