commit fe9d0ed6cb10d5403e54d2dd12628a0ec345ae6e
author Josh Gao <jmgao@google.com> Wed Oct 07 14:32:36 2015 -0700
committer Josh Gao <jmgao@google.com> Fri Oct 09 15:59:04 2015 -0700
tree 6d2041d7c21174599ed9815d43f43b82568ffebd
parent 93c0f5ee00d1357247fda333c9d49c8673c9c83b

Move setjmp cookie to a shared globals struct.

Change-Id: I59a4c187d61524c4e48655c4c6376dba0d41eee2

libc/bionic/libc_init_common.cpp

diff --git a/libc/bionic/libc_init_common.cpp b/libc/bionic/libc_init_common.cpp
index 5b9edaf..4995414 100644
--- a/libc/bionic/libc_init_common.cpp
+++ b/libc/bionic/libc_init_common.cpp
@@ -51,7 +51,6 @@
 #include "pthread_internal.h"
 
 extern "C" abort_msg_t** __abort_message_ptr;
-extern "C" void __bionic_setjmp_cookie_init(void);
 extern "C" int __system_properties_init(void);
 extern "C" int __set_tls(void* ptr);
 extern "C" int __set_tid_address(int* tid_address);
@@ -114,6 +113,7 @@
   __libc_globals.initialize();
   __libc_globals.mutate([&args](libc_globals* globals) {
     __libc_init_vdso(globals, args);
+    __libc_init_setjmp_cookie(globals, args);
   });
 }
 
@@ -133,7 +133,6 @@
   __pthread_internal_add(main_thread);
 
   __system_properties_init(); // Requires 'environ'.
-  __bionic_setjmp_cookie_init();
 }
 
 __noreturn static void __early_abort(int line) {