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

am 0e78f786: merge from open-source master

Browse Source 
Merge commit '0e78f786777a04af498b43564a8d6ed8e15e8940'

* commit '0e78f786777a04af498b43564a8d6ed8e15e8940':
  Change-Id: I68cc462aeb2460345a53bdb9941ce4bfc10456fb
This commit is contained in:
The Android Open Source Project
2010-07-09 10:54:06 -07:00
committed by Android Git Automerger
parent 4918d4cb0c 0e78f78677
commit fb6907d39c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libc/bionic/libc_init_common.c
View File

@@ -62,7 +62,7 @@ void __libc_init_common(uintptr_t *elfdata)
static pthread_internal_t thread;
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 stacksize = 128 * 1024;
unsigned stackbottom = stacktop - stacksize;

2
libc/bionic/libc_init_dynamic.c
View File

@@ -61,7 +61,7 @@ void __attribute__((constructor)) __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.
*
* Note that: