diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2015-04-15 14:07:28 -0700 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2015-04-15 14:23:00 -0700 |
| commit | 66aa0b61f736678e97a0cfaf975052881a23651b (patch) | |
| tree | 0377a161a2d6745f88c73bd6474916efb1dcaa99 /libc | |
| parent | cafc948069d447aa1e4dde599ee83bf6c0c5d5d8 (diff) | |
| download | bionic-66aa0b61f736678e97a0cfaf975052881a23651b.zip bionic-66aa0b61f736678e97a0cfaf975052881a23651b.tar.gz bionic-66aa0b61f736678e97a0cfaf975052881a23651b.tar.bz2 | |
Hide emutls* symbols in libc.so
Also make thread_local in test static to avoid ld.bfd
warning for arm64.
Change-Id: I09a3f2aa9b73a4fafa3f3bbc64ddc2a128ad50ee
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/Android.mk | 2 | ||||
| -rw-r--r-- | libc/bionic/__cxa_thread_atexit_impl.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index e632ee7..78b8475 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -1007,7 +1007,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) 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_CPPFLAGS := $(libc_common_cppflags) -Wold-style-cast diff --git a/libc/bionic/__cxa_thread_atexit_impl.cpp b/libc/bionic/__cxa_thread_atexit_impl.cpp index 9ae6dfd..0e427d3 100644 --- a/libc/bionic/__cxa_thread_atexit_impl.cpp +++ b/libc/bionic/__cxa_thread_atexit_impl.cpp @@ -22,7 +22,7 @@ struct thread_local_dtor { 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) { thread_local_dtor* dtor = new thread_local_dtor(); |