diff options
| author | Yabin Cui <yabinc@google.com> | 2014-12-11 20:50:41 -0800 |
|---|---|---|
| committer | Yabin Cui <yabinc@google.com> | 2014-12-12 17:00:08 -0800 |
| commit | 6c238f2926e69a950f0671ae5519584c20d84196 (patch) | |
| tree | a3593ca9ef0940c7518e47632c67047ad89cad40 /libc/bionic/pthread_create.cpp | |
| parent | 6d634f9baaf804a91c97e019c832c1e9611a903a (diff) | |
| download | android_bionic-6c238f2926e69a950f0671ae5519584c20d84196.tar.gz android_bionic-6c238f2926e69a950f0671ae5519584c20d84196.tar.bz2 android_bionic-6c238f2926e69a950f0671ae5519584c20d84196.zip | |
Fix pthread key num calculation.
Bug: 18723085
Change-Id: Iba2c834b350e4cdba0b2d771b221560a3e5df952
Diffstat (limited to 'libc/bionic/pthread_create.cpp')
| -rw-r--r-- | libc/bionic/pthread_create.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/bionic/pthread_create.cpp b/libc/bionic/pthread_create.cpp index 8bb1be9d9..c99e69c90 100644 --- a/libc/bionic/pthread_create.cpp +++ b/libc/bionic/pthread_create.cpp @@ -191,7 +191,7 @@ int pthread_create(pthread_t* thread_out, pthread_attr_t const* attr, // At offsets >= 0, we have the TLS slots. // At offsets < 0, we have the child stack. thread->tls = reinterpret_cast<void**>(reinterpret_cast<uint8_t*>(thread->attr.stack_base) + - thread->attr.stack_size - BIONIC_TLS_SLOTS * sizeof(void*)); + thread->attr.stack_size - BIONIC_ALIGN(BIONIC_TLS_SLOTS * sizeof(void*), 16)); void* child_stack = thread->tls; __init_tls(thread); |