am 155f5c5f: am ad8fb26a: Merge "Fix the exit syscall stub\'s name."

* commit '155f5c5ff9a86ed5319570ae13cc9a061930b0cb':
  Fix the exit syscall stub's name.
This commit is contained in:
Elliott Hughes
2013-10-25 09:29:38 -07:00
committed by Android Git Automerger
12 changed files with 25 additions and 26 deletions

View File

@@ -3,6 +3,7 @@ syscall_src :=
syscall_src += arch-arm/syscalls/__brk.S
syscall_src += arch-arm/syscalls/__clone.S
syscall_src += arch-arm/syscalls/__epoll_pwait.S
syscall_src += arch-arm/syscalls/__exit.S
syscall_src += arch-arm/syscalls/__fcntl.S
syscall_src += arch-arm/syscalls/__fcntl64.S
syscall_src += arch-arm/syscalls/__fstatfs64.S
@@ -34,7 +35,6 @@ syscall_src += arch-arm/syscalls/__timer_gettime.S
syscall_src += arch-arm/syscalls/__timer_settime.S
syscall_src += arch-arm/syscalls/__waitid.S
syscall_src += arch-arm/syscalls/_exit.S
syscall_src += arch-arm/syscalls/_exit_thread.S
syscall_src += arch-arm/syscalls/accept.S
syscall_src += arch-arm/syscalls/acct.S
syscall_src += arch-arm/syscalls/bind.S

View File

@@ -4,7 +4,7 @@
#include <linux/err.h>
#include <machine/asm.h>
ENTRY(_exit_thread)
ENTRY(__exit)
mov ip, r7
ldr r7, =__NR_exit
swi #0
@@ -13,4 +13,4 @@ ENTRY(_exit_thread)
bxls lr
neg r0, r0
b __set_errno
END(_exit_thread)
END(__exit)