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

am adeec096: Merge "Hide various symbols that shouldn\'t be exposed."

Browse Source 
* commit 'adeec096292a3ad63767f13af04836249ecbc075':
  Hide various symbols that shouldn't be exposed.
This commit is contained in:
Elliott Hughes 2013-03-15 17:07:45 -07:00 committed by Android Git Automerger
commit 987fc5a3c4
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/bionic/libc_init_common.h
View File

@ -50,7 +50,7 @@ __END_DECLS
#if defined(__cplusplus) #if defined(__cplusplus)
struct KernelArgumentBlock; struct KernelArgumentBlock;
void __libc_init_common(KernelArgumentBlock& args); void __LIBC_HIDDEN__ __libc_init_common(KernelArgumentBlock& args);
#endif #endif
#endif #endif

6
libc/bionic/libc_init_dynamic.cpp
View File

@ -63,9 +63,7 @@ extern "C" {
// that its address is listed in libc.so's .init_array section. // that its address is listed in libc.so's .init_array section.
// This ensures that the function is called by the dynamic linker // This ensures that the function is called by the dynamic linker
// as soon as the shared library is loaded. // as soon as the shared library is loaded.
void __attribute__((constructor)) __libc_preinit(void); __attribute__((constructor)) static void __libc_preinit() {
void __libc_preinit() {
// Read the kernel argument block pointer from TLS. // Read the kernel argument block pointer from TLS.
void* tls = const_cast<void*>(__get_tls()); void* tls = const_cast<void*>(__get_tls());
KernelArgumentBlock** args_slot = &reinterpret_cast<KernelArgumentBlock**>(tls)[TLS_SLOT_BIONIC_PREINIT]; KernelArgumentBlock** args_slot = &reinterpret_cast<KernelArgumentBlock**>(tls)[TLS_SLOT_BIONIC_PREINIT];
@ -82,7 +80,7 @@ void __libc_preinit() {
malloc_debug_init(); malloc_debug_init();
} }
void __libc_postfini() { __LIBC_HIDDEN__ void __libc_postfini() {
// A hook for the debug malloc library to let it know that we're shutting down. // A hook for the debug malloc library to let it know that we're shutting down.
malloc_debug_fini(); malloc_debug_fini();
} }

4
libc/bionic/pthread_key.cpp
View File

@ -185,8 +185,8 @@ class ScopedTlsMapAccess {
} }
}; };
tls_map_t ScopedTlsMapAccess::s_tls_map_; __LIBC_HIDDEN__ tls_map_t ScopedTlsMapAccess::s_tls_map_;
pthread_mutex_t ScopedTlsMapAccess::s_tls_map_lock_; __LIBC_HIDDEN__ pthread_mutex_t ScopedTlsMapAccess::s_tls_map_lock_;
__LIBC_HIDDEN__ void pthread_key_clean_all() { __LIBC_HIDDEN__ void pthread_key_clean_all() {
ScopedTlsMapAccess tls_map; ScopedTlsMapAccess tls_map;

2
libc/private/bionic_tls.h
View File

@ -114,7 +114,7 @@ __END_DECLS
#if defined(__cplusplus) #if defined(__cplusplus)
struct KernelArgumentBlock; struct KernelArgumentBlock;
extern void __libc_init_tls(KernelArgumentBlock& args); extern __LIBC_HIDDEN__ void __libc_init_tls(KernelArgumentBlock& args);
#endif #endif
#endif /* _SYS_TLS_H */ #endif /* _SYS_TLS_H */