generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Hide emutls* symbols in libc.so"

Browse Source
This commit is contained in:
Dmitriy Ivanov
2015-04-15 23:27:38 +00:00
committed by Gerrit Code Review
parent cafc948069 66aa0b61f7
commit c6ccdfaf1f
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libc/Android.mk
View File

@@ -1007,7 +1007,7 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libc_thread_atexit_impl_src_files) LOCAL_SRC_FILES := $(libc_thread_atexit_impl_src_files)
LOCAL_CFLAGS := $(libc_common_cflags) -fno-data-sections -Wframe-larger-than=2048 LOCAL_CFLAGS := $(libc_common_cflags) -Wframe-larger-than=2048
LOCAL_CONLYFLAGS := $(libc_common_conlyflags) LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
LOCAL_CPPFLAGS := $(libc_common_cppflags) -Wold-style-cast LOCAL_CPPFLAGS := $(libc_common_cppflags) -Wold-style-cast

2
libc/bionic/__cxa_thread_atexit_impl.cpp
View File

@@ -22,7 +22,7 @@ struct thread_local_dtor {
thread_local_dtor* next; thread_local_dtor* next;
}; };
__thread thread_local_dtor* thread_local_dtors = nullptr; static __thread thread_local_dtor* thread_local_dtors = nullptr;
extern "C" int __cxa_thread_atexit_impl(void (*func) (void *), void *arg, void *dso_handle) { extern "C" int __cxa_thread_atexit_impl(void (*func) (void *), void *arg, void *dso_handle) {
thread_local_dtor* dtor = new thread_local_dtor(); thread_local_dtor* dtor = new thread_local_dtor();

2
tests/__cxa_thread_atexit_test.cpp
View File

@@ -35,7 +35,7 @@ class ClassWithDtor {
std::string message; std::string message;
}; };
thread_local ClassWithDtor class_with_dtor; static thread_local ClassWithDtor class_with_dtor;
static void* thread_nop(void* arg) { static void* thread_nop(void* arg) {
class_with_dtor.set_message(*static_cast<std::string*>(arg)); class_with_dtor.set_message(*static_cast<std::string*>(arg));