Merge "Init stdio in __libc_init_common."

am: 6bef152af2

* commit '6bef152af2c622ee0c57f9c374b76f3dd352e52b':
  Init stdio in __libc_init_common.
This commit is contained in:
Yabin Cui 2015-11-30 23:58:50 +00:00 committed by android-build-merger
commit 1f4b0c44b3

View file

@ -54,6 +54,7 @@ extern "C" abort_msg_t** __abort_message_ptr;
extern "C" int __system_properties_init(void);
extern "C" int __set_tls(void* ptr);
extern "C" int __set_tid_address(int* tid_address);
extern "C" int __sinit(void);
__LIBC_HIDDEN__ WriteProtected<libc_globals> __libc_globals;
@ -133,6 +134,9 @@ void __libc_init_common(KernelArgumentBlock& args) {
__pthread_internal_add(main_thread);
__system_properties_init(); // Requires 'environ'.
// Initialize stdio here to get rid of data races caused by lazy initialization.
// TODO: Remove other calls to __sinit().
__sinit();
}
__noreturn static void __early_abort(int line) {