From ef0bd1857041ffde069cf52138aaf22c1af7130e Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Fri, 17 Jul 2009 17:55:01 +0200 Subject: Pass the elfdata pointer in a slot of the temporary TLS area. This is needed to properly initialize the C runtime when libc.so is loaded by the dynamic linker. Move the temporary TLS setup before the first system call, just in case something really horrible happens, we won't crash when trying to write an error code in 'errno' Remove the broken TLS_SLOT_THREAD_ID setup. First, this slot should normally receive the address of a pthread_internal_t, not a kernel thread identifier. Second, it is never used by the linker anyway. Also remove an obsolete comment. --- libc/private/bionic_tls.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'libc/private') diff --git a/libc/private/bionic_tls.h b/libc/private/bionic_tls.h index da34344..82c8cd9 100644 --- a/libc/private/bionic_tls.h +++ b/libc/private/bionic_tls.h @@ -60,6 +60,13 @@ __BEGIN_DECLS #define TLS_SLOT_OPENGL_API 3 #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 * on keys that are <= TLS_SLOT_MAX_WELL_KNOWN, which is why it is set to * TLS_SLOT_ERRNO. -- cgit v1.1