commit 6bef152af2c622ee0c57f9c374b76f3dd352e52b
author Yabin Cui <yabinc@google.com> Mon Nov 30 23:57:02 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 30 23:57:02 2015 +0000
tree c7a6e152b450b5280ec5d2fbb4eaf0e41dd1b325
parent af87c9ccfc3afbc7db9f0bc131d122453b5c882d
parent d68c9e5906917f1528fe16c2c657e3a34c16e536

Merge "Init stdio in __libc_init_common."

libc/bionic/libc_init_common.cpp

diff --git a/libc/bionic/libc_init_common.cpp b/libc/bionic/libc_init_common.cpp
index 8f1ee95..91e210e 100644
--- a/libc/bionic/libc_init_common.cpp
+++ b/libc/bionic/libc_init_common.cpp
@@ -54,6 +54,7 @@
 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 @@
   __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) {