commit 3a654b1e04d4275ae315cfe1b196998acf10052c
author David 'Digit' Turner <digit@google.com> Wed Jun 03 19:32:37 2009 +0200
committer David 'Digit' Turner <digit@google.com> Wed Jun 03 19:32:37 2009 +0200
tree 79ce08ac573c6c5bd7d7a65f7fdc24237c00452a
parent 03eabfe65e1e2c36f4d26c78a730fa19a3bdada3

Revert "Fix the C library initialization to avoid calling static C++ constructors twice."

This reverts commit 03eabfe65e1e2c36f4d26c78a730fa19a3bdada3.

linker/linker.c

diff --git a/linker/linker.c b/linker/linker.c
index e7d5ab4..e398f82 100644
--- a/linker/linker.c
+++ b/linker/linker.c
@@ -44,7 +44,7 @@
 #include <sys/atomics.h>
 
 /* special private C library header - see Android.mk */
-#include <bionic_preinit.h>
+#include <bionic_tls.h>
 
 #include "linker.h"
 #include "linker_debug.h"
@@ -1691,7 +1691,6 @@
 #define ANDROID_TLS_SLOTS  BIONIC_TLS_SLOTS
 
 static void * __tls_area[ANDROID_TLS_SLOTS];
-static pthread_internal_t  __main_thread;
 
 unsigned __linker_init(unsigned **elfdata)
 {
@@ -1710,7 +1709,8 @@
     gettimeofday(&t0, 0);
 #endif
 
-    __libc_preinit(&__main_thread, __tls_area);
+    __set_tls(__tls_area);
+    ((unsigned *)__get_tls())[TLS_SLOT_THREAD_ID] = gettid();
 
     debugger_init();