am a513f70b: Merge "bionic: Stack pointer/signal race condition."

* commit 'a513f70b43e75136145d756388b50028ac4fc4b8':
  bionic: Stack pointer/signal race condition.
This commit is contained in:
Elliott Hughes 2012-07-31 10:38:26 -07:00 committed by Android Git Automerger
commit 7645355ecd

View File

@ -30,8 +30,7 @@
ENTRY(__pthread_clone) ENTRY(__pthread_clone)
@ insert the args onto the new stack @ insert the args onto the new stack
str r0, [r1, #-4] stmdb r1!, {r0, r3}
str r3, [r1, #-8]
@ do the system call @ do the system call
@ get flags @ get flags
@ -60,8 +59,7 @@ ENTRY(__pthread_clone)
@ to the C __thread_entry function which does some setup and then @ to the C __thread_entry function which does some setup and then
@ calls the thread's start function @ calls the thread's start function
ldr r0, [sp, #-4] pop {r0, r1}
ldr r1, [sp, #-8]
mov r2, sp @ __thread_entry needs the TLS pointer mov r2, sp @ __thread_entry needs the TLS pointer
b __thread_entry b __thread_entry