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

am ef0bd185: Pass the elfdata pointer in a slot of the temporary TLS area.

Browse Source 
Merge commit 'ef0bd1857041ffde069cf52138aaf22c1af7130e'

* commit 'ef0bd1857041ffde069cf52138aaf22c1af7130e':
  Pass the elfdata pointer in a slot of the temporary TLS area.
This commit is contained in:
David 'Digit' Turner 2009-07-20 00:12:01 -07:00 committed by Android Git Automerger
commit d63185fd88
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libc/private/bionic_tls.h
View File

@ -60,6 +60,13 @@ __BEGIN_DECLS
#define TLS_SLOT_OPENGL_API 3 #define TLS_SLOT_OPENGL_API 3
#define TLS_SLOT_OPENGL 4 #define TLS_SLOT_OPENGL 4
/* this slot is only used to pass information from the dynamic linker to
* libc.so when the C library is loaded in to memory. The C runtime init
* function will then clear it. Since its use is extremely temporary,
* we reuse an existing location.
*/
#define TLS_SLOT_BIONIC_PREINIT (TLS_SLOT_ERRNO+1)
/* small technical note: it is not possible to call pthread_setspecific /* small technical note: it is not possible to call pthread_setspecific
* on keys that are <= TLS_SLOT_MAX_WELL_KNOWN, which is why it is set to * on keys that are <= TLS_SLOT_MAX_WELL_KNOWN, which is why it is set to
* TLS_SLOT_ERRNO. * TLS_SLOT_ERRNO.

21
linker/linker.c
View File

@ -76,11 +76,6 @@
* headers provide versions that are negative... * headers provide versions that are negative...
* - allocate space for soinfo structs dynamically instead of * - allocate space for soinfo structs dynamically instead of
* having a hard limit (64) * having a hard limit (64)
*
* features to add someday:
*
* - dlopen() and friends
*
*/ */
@ -1744,6 +1739,11 @@ unsigned __linker_init(unsigned **elfdata)
struct link_map * map; struct link_map * map;
char *ldpath_env = NULL; char *ldpath_env = NULL;
/* Setup a temporary TLS area that is used to get a working
* errno for system calls.
*/
__set_tls(__tls_area);
pid = getpid(); pid = getpid();
#if TIMING #if TIMING
@ -1751,8 +1751,15 @@ unsigned __linker_init(unsigned **elfdata)
gettimeofday(&t0, 0); gettimeofday(&t0, 0);
#endif #endif
__set_tls(__tls_area); /* NOTE: we store the elfdata pointer on a special location
((unsigned *)__get_tls())[TLS_SLOT_THREAD_ID] = gettid(); * of the temporary TLS area in order to pass it to
* the C Library's runtime initializer.
*
* The initializer must clear the slot and reset the TLS
* to point to a different location to ensure that no other
* shared library constructor can access it.
*/
__tls_area[TLS_SLOT_BIONIC_PREINIT] = elfdata;
debugger_init(); debugger_init();