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

Merge "Hide __signalfd4, used to implement signalfd(3)."

Browse Source
This commit is contained in:
Elliott Hughes 2014-05-16 22:51:28 +00:00 committed by Gerrit Code Review
commit e2d5746a8a
8 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/SYSCALLS.TXT
View File

@ -228,7 +228,7 @@ int __rt_sigpending:rt_sigpending(sigset_t*, size_t) all
int __rt_sigprocmask:rt_sigprocmask(int, const sigset_t*, sigset_t*, size_t) all
int __rt_sigsuspend:rt_sigsuspend(const sigset_t*, size_t) all
int __rt_sigtimedwait:rt_sigtimedwait(const sigset_t*, struct siginfo_t*, struct timespec_t*, size_t) all
int signalfd4(int, const sigset_t*, size_t, int) all
int __signalfd4:signalfd4(int, const sigset_t*, size_t, int) all
# sockets
int socket(int, int, int) arm,arm64,mips,mips64,x86_64

4
libc/arch-arm/syscalls/signalfd4.S → libc/arch-arm/syscalls/__signalfd4.S
View File

@ -2,7 +2,7 @@
#include <private/bionic_asm.h>
ENTRY(signalfd4)
ENTRY(__signalfd4)
mov ip, r7
ldr r7, =__NR_signalfd4
swi #0
@ -11,4 +11,4 @@ ENTRY(signalfd4)
bxls lr
neg r0, r0
b __set_errno
END(signalfd4)
END(__signalfd4)

5
libc/arch-arm64/syscalls/signalfd4.S → libc/arch-arm64/syscalls/__signalfd4.S
View File

@ -2,7 +2,7 @@
#include <private/bionic_asm.h>
ENTRY(signalfd4)
ENTRY(__signalfd4)
stp x29, x30, [sp, #-16]!
mov x29, sp
str x8, [sp, #-16]!
@ -18,4 +18,5 @@ ENTRY(signalfd4)
b.hi __set_errno
ret
END(signalfd4)
END(__signalfd4)
.hidden __signalfd4

4
libc/arch-mips/syscalls/signalfd4.S → libc/arch-mips/syscalls/__signalfd4.S
View File

@ -2,7 +2,7 @@
#include <private/bionic_asm.h>
ENTRY(signalfd4)
ENTRY(__signalfd4)
.set noreorder
.cpload t9
li v0, __NR_signalfd4
@ -16,4 +16,4 @@ ENTRY(signalfd4)
j t9
nop
.set reorder
END(signalfd4)
END(__signalfd4)

5
libc/arch-mips64/syscalls/signalfd4.S → libc/arch-mips64/syscalls/__signalfd4.S
View File

@ -2,7 +2,7 @@
#include <private/bionic_asm.h>
ENTRY(signalfd4)
ENTRY(__signalfd4)
.set push
.set noreorder
li v0, __NR_signalfd4
@ -22,4 +22,5 @@ ENTRY(signalfd4)
j t9
move ra, t0
.set pop
END(signalfd4)
END(__signalfd4)
.hidden __signalfd4

4
libc/arch-x86/syscalls/signalfd4.S → libc/arch-x86/syscalls/__signalfd4.S
View File

@ -2,7 +2,7 @@
#include <private/bionic_asm.h>
ENTRY(signalfd4)
ENTRY(__signalfd4)
pushl %ebx
pushl %ecx
pushl %edx
@ -31,4 +31,4 @@ ENTRY(signalfd4)
popl %ecx
popl %ebx
ret
END(signalfd4)
END(__signalfd4)

5
libc/arch-x86_64/syscalls/signalfd4.S → libc/arch-x86_64/syscalls/__signalfd4.S
View File

@ -2,7 +2,7 @@
#include <private/bionic_asm.h>
ENTRY(signalfd4)
ENTRY(__signalfd4)
movq %rcx, %r10
movl $__NR_signalfd4, %eax
syscall
@ -14,4 +14,5 @@ ENTRY(signalfd4)
orq $-1, %rax
1:
ret
END(signalfd4)
END(__signalfd4)
.hidden __signalfd4

4
libc/bionic/signalfd.cpp
View File

@ -30,9 +30,9 @@
#include "private/kernel_sigset_t.h"
extern "C" int signalfd4(int fd, kernel_sigset_t* mask, size_t sizemask, int flags);
extern "C" int __signalfd4(int fd, kernel_sigset_t* mask, size_t sizemask, int flags);
int signalfd(int fd, const sigset_t* mask, int flags) {
kernel_sigset_t in_set(mask);
return signalfd4(fd, &in_set, sizeof(in_set), flags);
return __signalfd4(fd, &in_set, sizeof(in_set), flags);
}