merge from open-source master
Change-Id: Id84ff747889d6f2c15c0510263e32fdfdd18dbed
This commit is contained in:
commit
0e78f78677
2 changed files with 2 additions and 2 deletions
|
@ -62,7 +62,7 @@ void __libc_init_common(uintptr_t *elfdata)
|
||||||
static pthread_internal_t thread;
|
static pthread_internal_t thread;
|
||||||
static void* tls_area[BIONIC_TLS_SLOTS];
|
static void* tls_area[BIONIC_TLS_SLOTS];
|
||||||
|
|
||||||
/* setup pthread runtime and maint thread descriptor */
|
/* setup pthread runtime and main thread descriptor */
|
||||||
unsigned stacktop = (__get_sp() & ~(PAGE_SIZE - 1)) + PAGE_SIZE;
|
unsigned stacktop = (__get_sp() & ~(PAGE_SIZE - 1)) + PAGE_SIZE;
|
||||||
unsigned stacksize = 128 * 1024;
|
unsigned stacksize = 128 * 1024;
|
||||||
unsigned stackbottom = stacktop - stacksize;
|
unsigned stackbottom = stacktop - stacksize;
|
||||||
|
|
|
@ -61,7 +61,7 @@ void __attribute__((constructor)) __libc_prenit(void);
|
||||||
|
|
||||||
void __libc_prenit(void)
|
void __libc_prenit(void)
|
||||||
{
|
{
|
||||||
/* Read the ELF data pointer form a special slot of the
|
/* Read the ELF data pointer from a special slot of the
|
||||||
* TLS area, then call __libc_init_common with it.
|
* TLS area, then call __libc_init_common with it.
|
||||||
*
|
*
|
||||||
* Note that:
|
* Note that:
|
||||||
|
|
Loading…
Reference in a new issue