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

am 2039949b: am 967cd1bc: Merge "Fix sigaction(3) for 64-bit."

Browse Source 
* commit '2039949b225a3f6414250385b8d814440c24bab5':
  Fix sigaction(3) for 64-bit.
This commit is contained in:
Elliott Hughes
2013-10-17 11:52:30 -07:00
committed by Android Git Automerger
parent 811b0cdb2d 2039949b22
commit 7efbac17bf
20 changed files with 358 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libc/arch-arm/syscalls.mk
View File

@@ -22,6 +22,7 @@ syscall_src += arch-arm/syscalls/__rt_sigsuspend.S
syscall_src += arch-arm/syscalls/__rt_sigtimedwait.S
syscall_src += arch-arm/syscalls/__sched_getaffinity.S
syscall_src += arch-arm/syscalls/__set_tls.S
syscall_src += arch-arm/syscalls/__sigaction.S
syscall_src += arch-arm/syscalls/__statfs64.S
syscall_src += arch-arm/syscalls/__sys_clone.S
syscall_src += arch-arm/syscalls/__syslog.S
@@ -178,7 +179,6 @@ syscall_src += arch-arm/syscalls/settimeofday.S
syscall_src += arch-arm/syscalls/setuid.S
syscall_src += arch-arm/syscalls/setxattr.S
syscall_src += arch-arm/syscalls/shutdown.S
syscall_src += arch-arm/syscalls/sigaction.S
syscall_src += arch-arm/syscalls/sigaltstack.S
syscall_src += arch-arm/syscalls/signalfd4.S
syscall_src += arch-arm/syscalls/socket.S

4
libc/arch-arm/syscalls/sigaction.S → libc/arch-arm/syscalls/__sigaction.S
View File

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