Merge "Use ENTRY_PRIVATE in __bionic_clone assembler."
This commit is contained in:
commit
b1d98da378
|
@ -29,7 +29,7 @@
|
||||||
#include <private/bionic_asm.h>
|
#include <private/bionic_asm.h>
|
||||||
|
|
||||||
// pid_t __bionic_clone(int flags, void* child_stack, pid_t* parent_tid, void* tls, pid_t* child_tid, int (*fn)(void*), void* arg);
|
// pid_t __bionic_clone(int flags, void* child_stack, pid_t* parent_tid, void* tls, pid_t* child_tid, int (*fn)(void*), void* arg);
|
||||||
ENTRY(__bionic_clone)
|
ENTRY_PRIVATE(__bionic_clone)
|
||||||
mov ip, sp
|
mov ip, sp
|
||||||
# save registers to parent stack
|
# save registers to parent stack
|
||||||
stmfd sp!, {r4, r5, r6, r7}
|
stmfd sp!, {r4, r5, r6, r7}
|
||||||
|
@ -67,4 +67,3 @@ ENTRY(__bionic_clone)
|
||||||
pop {r0, r1}
|
pop {r0, r1}
|
||||||
b __start_thread
|
b __start_thread
|
||||||
END(__bionic_clone)
|
END(__bionic_clone)
|
||||||
.hidden __bionic_clone
|
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
|
|
||||||
// pid_t __bionic_clone(int flags, void* child_stack, pid_t* parent_tid, void* tls, pid_t* child_tid, int (*fn)(void*), void* arg);
|
// pid_t __bionic_clone(int flags, void* child_stack, pid_t* parent_tid, void* tls, pid_t* child_tid, int (*fn)(void*), void* arg);
|
||||||
|
|
||||||
ENTRY(__bionic_clone)
|
ENTRY_PRIVATE(__bionic_clone)
|
||||||
# Push 'fn' and 'arg' onto the child stack.
|
# Push 'fn' and 'arg' onto the child stack.
|
||||||
stp x5, x6, [x1, #-16]!
|
stp x5, x6, [x1, #-16]!
|
||||||
|
|
||||||
|
@ -57,4 +57,3 @@ ENTRY(__bionic_clone)
|
||||||
ldp x0, x1, [sp], #16
|
ldp x0, x1, [sp], #16
|
||||||
b __start_thread
|
b __start_thread
|
||||||
END(__bionic_clone)
|
END(__bionic_clone)
|
||||||
.hidden __bionic_clone
|
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
#include <linux/sched.h>
|
#include <linux/sched.h>
|
||||||
|
|
||||||
// pid_t __bionic_clone(int flags, void* child_stack, pid_t* parent_tid, void* tls, pid_t* child_tid, int (*fn)(void*), void* arg);
|
// pid_t __bionic_clone(int flags, void* child_stack, pid_t* parent_tid, void* tls, pid_t* child_tid, int (*fn)(void*), void* arg);
|
||||||
ENTRY(__bionic_clone)
|
ENTRY_PRIVATE(__bionic_clone)
|
||||||
.set noreorder
|
.set noreorder
|
||||||
.cpload t9
|
.cpload t9
|
||||||
.set reorder
|
.set reorder
|
||||||
|
@ -69,4 +69,3 @@ ENTRY(__bionic_clone)
|
||||||
la t9,__set_errno_internal
|
la t9,__set_errno_internal
|
||||||
j t9
|
j t9
|
||||||
END(__bionic_clone)
|
END(__bionic_clone)
|
||||||
.hidden __bionic_clone
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#include <private/bionic_asm.h>
|
#include <private/bionic_asm.h>
|
||||||
|
|
||||||
// pid_t __bionic_clone(int flags, void* child_stack, pid_t* parent_tid, void* tls, pid_t* child_tid, int (*fn)(void*), void* arg);
|
// pid_t __bionic_clone(int flags, void* child_stack, pid_t* parent_tid, void* tls, pid_t* child_tid, int (*fn)(void*), void* arg);
|
||||||
ENTRY(__bionic_clone)
|
ENTRY_PRIVATE(__bionic_clone)
|
||||||
pushl %ebx
|
pushl %ebx
|
||||||
.cfi_adjust_cfa_offset 4
|
.cfi_adjust_cfa_offset 4
|
||||||
.cfi_rel_offset ebx, 0
|
.cfi_rel_offset ebx, 0
|
||||||
|
@ -62,4 +62,3 @@ ENTRY(__bionic_clone)
|
||||||
.cfi_restore ebx
|
.cfi_restore ebx
|
||||||
ret
|
ret
|
||||||
END(__bionic_clone)
|
END(__bionic_clone)
|
||||||
.hidden __bionic_clone
|
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
#include <private/bionic_asm.h>
|
#include <private/bionic_asm.h>
|
||||||
|
|
||||||
// pid_t __bionic_clone(int flags, void* child_stack, pid_t* parent_tid, void* tls, pid_t* child_tid, int (*fn)(void*), void* arg);
|
// pid_t __bionic_clone(int flags, void* child_stack, pid_t* parent_tid, void* tls, pid_t* child_tid, int (*fn)(void*), void* arg);
|
||||||
ENTRY(__bionic_clone)
|
ENTRY_PRIVATE(__bionic_clone)
|
||||||
# Copy 'fn' and 'arg' onto the child stack.
|
# Copy 'fn' and 'arg' onto the child stack.
|
||||||
movq %r9, -16(%rsi) # fn
|
movq %r9, -16(%rsi) # fn
|
||||||
movq 8(%rsp), %rax # Read 'arg'.
|
movq 8(%rsp), %rax # Read 'arg'.
|
||||||
|
@ -74,4 +74,3 @@ ENTRY(__bionic_clone)
|
||||||
# We're the parent; nothing to do.
|
# We're the parent; nothing to do.
|
||||||
ret
|
ret
|
||||||
END(__bionic_clone)
|
END(__bionic_clone)
|
||||||
.hidden __bionic_clone
|
|
||||||
|
|
Loading…
Reference in New Issue