From 7490c5c5944391e99bc6c3564bce03d3cd4a39e0 Mon Sep 17 00:00:00 2001 From: Yabin Cui Date: Mon, 18 May 2015 11:19:11 -0700 Subject: Hide rt_sigqueueinfo. Bug: 19358804 Change-Id: I38a53ad64c81d0eefdd1d24599e769fd8a477a56 (cherry picked from commit 40a8f214a5264efe5feaaffd55cea67fb87d097b) --- libc/SYSCALLS.TXT | 2 +- libc/arch-arm/syscalls/___rt_sigqueueinfo.S | 15 ++++++++++++ libc/arch-arm/syscalls/__rt_sigqueueinfo.S | 14 ----------- libc/arch-arm64/syscalls/___rt_sigqueueinfo.S | 15 ++++++++++++ libc/arch-arm64/syscalls/__rt_sigqueueinfo.S | 15 ------------ libc/arch-mips/syscalls/___rt_sigqueueinfo.S | 20 ++++++++++++++++ libc/arch-mips/syscalls/__rt_sigqueueinfo.S | 19 --------------- libc/arch-mips64/syscalls/___rt_sigqueueinfo.S | 26 +++++++++++++++++++++ libc/arch-mips64/syscalls/__rt_sigqueueinfo.S | 26 --------------------- libc/arch-x86/syscalls/___rt_sigqueueinfo.S | 32 ++++++++++++++++++++++++++ libc/arch-x86/syscalls/__rt_sigqueueinfo.S | 31 ------------------------- libc/arch-x86_64/syscalls/___rt_sigqueueinfo.S | 16 +++++++++++++ libc/arch-x86_64/syscalls/__rt_sigqueueinfo.S | 16 ------------- libc/bionic/sigqueue.cpp | 4 ++-- 14 files changed, 127 insertions(+), 124 deletions(-) create mode 100644 libc/arch-arm/syscalls/___rt_sigqueueinfo.S delete mode 100644 libc/arch-arm/syscalls/__rt_sigqueueinfo.S create mode 100644 libc/arch-arm64/syscalls/___rt_sigqueueinfo.S delete mode 100644 libc/arch-arm64/syscalls/__rt_sigqueueinfo.S create mode 100644 libc/arch-mips/syscalls/___rt_sigqueueinfo.S delete mode 100644 libc/arch-mips/syscalls/__rt_sigqueueinfo.S create mode 100644 libc/arch-mips64/syscalls/___rt_sigqueueinfo.S delete mode 100644 libc/arch-mips64/syscalls/__rt_sigqueueinfo.S create mode 100644 libc/arch-x86/syscalls/___rt_sigqueueinfo.S delete mode 100644 libc/arch-x86/syscalls/__rt_sigqueueinfo.S create mode 100644 libc/arch-x86_64/syscalls/___rt_sigqueueinfo.S delete mode 100644 libc/arch-x86_64/syscalls/__rt_sigqueueinfo.S diff --git a/libc/SYSCALLS.TXT b/libc/SYSCALLS.TXT index 33e30eb..0246833 100644 --- a/libc/SYSCALLS.TXT +++ b/libc/SYSCALLS.TXT @@ -223,7 +223,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 __rt_sigqueueinfo:rt_sigqueueinfo(pid_t, int, siginfo_t*) all +int ___rt_sigqueueinfo:rt_sigqueueinfo(pid_t, int, siginfo_t*) all int __signalfd4:signalfd4(int, const sigset_t*, size_t, int) all # sockets diff --git a/libc/arch-arm/syscalls/___rt_sigqueueinfo.S b/libc/arch-arm/syscalls/___rt_sigqueueinfo.S new file mode 100644 index 0000000..25b0d57 --- /dev/null +++ b/libc/arch-arm/syscalls/___rt_sigqueueinfo.S @@ -0,0 +1,15 @@ +/* Generated by gensyscalls.py. Do not edit. */ + +#include + +ENTRY(___rt_sigqueueinfo) + mov ip, r7 + ldr r7, =__NR_rt_sigqueueinfo + swi #0 + mov r7, ip + cmn r0, #(MAX_ERRNO + 1) + bxls lr + neg r0, r0 + b __set_errno_internal +END(___rt_sigqueueinfo) +.hidden ___rt_sigqueueinfo diff --git a/libc/arch-arm/syscalls/__rt_sigqueueinfo.S b/libc/arch-arm/syscalls/__rt_sigqueueinfo.S deleted file mode 100644 index c823cee..0000000 --- a/libc/arch-arm/syscalls/__rt_sigqueueinfo.S +++ /dev/null @@ -1,14 +0,0 @@ -/* Generated by gensyscalls.py. Do not edit. */ - -#include - -ENTRY(__rt_sigqueueinfo) - mov ip, r7 - ldr r7, =__NR_rt_sigqueueinfo - swi #0 - mov r7, ip - cmn r0, #(MAX_ERRNO + 1) - bxls lr - neg r0, r0 - b __set_errno_internal -END(__rt_sigqueueinfo) diff --git a/libc/arch-arm64/syscalls/___rt_sigqueueinfo.S b/libc/arch-arm64/syscalls/___rt_sigqueueinfo.S new file mode 100644 index 0000000..85ea132 --- /dev/null +++ b/libc/arch-arm64/syscalls/___rt_sigqueueinfo.S @@ -0,0 +1,15 @@ +/* Generated by gensyscalls.py. Do not edit. */ + +#include + +ENTRY(___rt_sigqueueinfo) + mov x8, __NR_rt_sigqueueinfo + svc #0 + + cmn x0, #(MAX_ERRNO + 1) + cneg x0, x0, hi + b.hi __set_errno_internal + + ret +END(___rt_sigqueueinfo) +.hidden ___rt_sigqueueinfo diff --git a/libc/arch-arm64/syscalls/__rt_sigqueueinfo.S b/libc/arch-arm64/syscalls/__rt_sigqueueinfo.S deleted file mode 100644 index 2b23e18..0000000 --- a/libc/arch-arm64/syscalls/__rt_sigqueueinfo.S +++ /dev/null @@ -1,15 +0,0 @@ -/* Generated by gensyscalls.py. Do not edit. */ - -#include - -ENTRY(__rt_sigqueueinfo) - mov x8, __NR_rt_sigqueueinfo - svc #0 - - cmn x0, #(MAX_ERRNO + 1) - cneg x0, x0, hi - b.hi __set_errno_internal - - ret -END(__rt_sigqueueinfo) -.hidden __rt_sigqueueinfo diff --git a/libc/arch-mips/syscalls/___rt_sigqueueinfo.S b/libc/arch-mips/syscalls/___rt_sigqueueinfo.S new file mode 100644 index 0000000..95af36f --- /dev/null +++ b/libc/arch-mips/syscalls/___rt_sigqueueinfo.S @@ -0,0 +1,20 @@ +/* Generated by gensyscalls.py. Do not edit. */ + +#include + +ENTRY(___rt_sigqueueinfo) + .set noreorder + .cpload t9 + li v0, __NR_rt_sigqueueinfo + syscall + bnez a3, 1f + move a0, v0 + j ra + nop +1: + la t9,__set_errno_internal + j t9 + nop + .set reorder +END(___rt_sigqueueinfo) +.hidden ___rt_sigqueueinfo diff --git a/libc/arch-mips/syscalls/__rt_sigqueueinfo.S b/libc/arch-mips/syscalls/__rt_sigqueueinfo.S deleted file mode 100644 index a978bc4..0000000 --- a/libc/arch-mips/syscalls/__rt_sigqueueinfo.S +++ /dev/null @@ -1,19 +0,0 @@ -/* Generated by gensyscalls.py. Do not edit. */ - -#include - -ENTRY(__rt_sigqueueinfo) - .set noreorder - .cpload t9 - li v0, __NR_rt_sigqueueinfo - syscall - bnez a3, 1f - move a0, v0 - j ra - nop -1: - la t9,__set_errno_internal - j t9 - nop - .set reorder -END(__rt_sigqueueinfo) diff --git a/libc/arch-mips64/syscalls/___rt_sigqueueinfo.S b/libc/arch-mips64/syscalls/___rt_sigqueueinfo.S new file mode 100644 index 0000000..1503f51 --- /dev/null +++ b/libc/arch-mips64/syscalls/___rt_sigqueueinfo.S @@ -0,0 +1,26 @@ +/* Generated by gensyscalls.py. Do not edit. */ + +#include + +ENTRY(___rt_sigqueueinfo) + .set push + .set noreorder + li v0, __NR_rt_sigqueueinfo + syscall + bnez a3, 1f + move a0, v0 + j ra + nop +1: + move t0, ra + bal 2f + nop +2: + .cpsetup ra, t1, 2b + LA t9,__set_errno_internal + .cpreturn + j t9 + move ra, t0 + .set pop +END(___rt_sigqueueinfo) +.hidden ___rt_sigqueueinfo diff --git a/libc/arch-mips64/syscalls/__rt_sigqueueinfo.S b/libc/arch-mips64/syscalls/__rt_sigqueueinfo.S deleted file mode 100644 index e97aeba..0000000 --- a/libc/arch-mips64/syscalls/__rt_sigqueueinfo.S +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated by gensyscalls.py. Do not edit. */ - -#include - -ENTRY(__rt_sigqueueinfo) - .set push - .set noreorder - li v0, __NR_rt_sigqueueinfo - syscall - bnez a3, 1f - move a0, v0 - j ra - nop -1: - move t0, ra - bal 2f - nop -2: - .cpsetup ra, t1, 2b - LA t9,__set_errno_internal - .cpreturn - j t9 - move ra, t0 - .set pop -END(__rt_sigqueueinfo) -.hidden __rt_sigqueueinfo diff --git a/libc/arch-x86/syscalls/___rt_sigqueueinfo.S b/libc/arch-x86/syscalls/___rt_sigqueueinfo.S new file mode 100644 index 0000000..97d167f --- /dev/null +++ b/libc/arch-x86/syscalls/___rt_sigqueueinfo.S @@ -0,0 +1,32 @@ +/* Generated by gensyscalls.py. Do not edit. */ + +#include + +ENTRY(___rt_sigqueueinfo) + pushl %ebx + .cfi_def_cfa_offset 8 + .cfi_rel_offset ebx, 0 + pushl %ecx + .cfi_adjust_cfa_offset 4 + .cfi_rel_offset ecx, 0 + pushl %edx + .cfi_adjust_cfa_offset 4 + .cfi_rel_offset edx, 0 + mov 16(%esp), %ebx + mov 20(%esp), %ecx + mov 24(%esp), %edx + movl $__NR_rt_sigqueueinfo, %eax + int $0x80 + cmpl $-MAX_ERRNO, %eax + jb 1f + negl %eax + pushl %eax + call __set_errno_internal + addl $4, %esp +1: + popl %edx + popl %ecx + popl %ebx + ret +END(___rt_sigqueueinfo) +.hidden ___rt_sigqueueinfo diff --git a/libc/arch-x86/syscalls/__rt_sigqueueinfo.S b/libc/arch-x86/syscalls/__rt_sigqueueinfo.S deleted file mode 100644 index 4152100..0000000 --- a/libc/arch-x86/syscalls/__rt_sigqueueinfo.S +++ /dev/null @@ -1,31 +0,0 @@ -/* Generated by gensyscalls.py. Do not edit. */ - -#include - -ENTRY(__rt_sigqueueinfo) - pushl %ebx - .cfi_def_cfa_offset 8 - .cfi_rel_offset ebx, 0 - pushl %ecx - .cfi_adjust_cfa_offset 4 - .cfi_rel_offset ecx, 0 - pushl %edx - .cfi_adjust_cfa_offset 4 - .cfi_rel_offset edx, 0 - mov 16(%esp), %ebx - mov 20(%esp), %ecx - mov 24(%esp), %edx - movl $__NR_rt_sigqueueinfo, %eax - int $0x80 - cmpl $-MAX_ERRNO, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno_internal - addl $4, %esp -1: - popl %edx - popl %ecx - popl %ebx - ret -END(__rt_sigqueueinfo) diff --git a/libc/arch-x86_64/syscalls/___rt_sigqueueinfo.S b/libc/arch-x86_64/syscalls/___rt_sigqueueinfo.S new file mode 100644 index 0000000..8c6b30b --- /dev/null +++ b/libc/arch-x86_64/syscalls/___rt_sigqueueinfo.S @@ -0,0 +1,16 @@ +/* Generated by gensyscalls.py. Do not edit. */ + +#include + +ENTRY(___rt_sigqueueinfo) + movl $__NR_rt_sigqueueinfo, %eax + syscall + cmpq $-MAX_ERRNO, %rax + jb 1f + negl %eax + movl %eax, %edi + call __set_errno_internal +1: + ret +END(___rt_sigqueueinfo) +.hidden ___rt_sigqueueinfo diff --git a/libc/arch-x86_64/syscalls/__rt_sigqueueinfo.S b/libc/arch-x86_64/syscalls/__rt_sigqueueinfo.S deleted file mode 100644 index 52b6863..0000000 --- a/libc/arch-x86_64/syscalls/__rt_sigqueueinfo.S +++ /dev/null @@ -1,16 +0,0 @@ -/* Generated by gensyscalls.py. Do not edit. */ - -#include - -ENTRY(__rt_sigqueueinfo) - movl $__NR_rt_sigqueueinfo, %eax - syscall - cmpq $-MAX_ERRNO, %rax - jb 1f - negl %eax - movl %eax, %edi - call __set_errno_internal -1: - ret -END(__rt_sigqueueinfo) -.hidden __rt_sigqueueinfo diff --git a/libc/bionic/sigqueue.cpp b/libc/bionic/sigqueue.cpp index 39c8798..8741460 100644 --- a/libc/bionic/sigqueue.cpp +++ b/libc/bionic/sigqueue.cpp @@ -31,7 +31,7 @@ #include #include -extern "C" int __rt_sigqueueinfo(pid_t, int, siginfo_t*); +extern "C" int ___rt_sigqueueinfo(pid_t, int, siginfo_t*); int sigqueue(pid_t pid, int signo, const sigval value) { siginfo_t info; @@ -42,5 +42,5 @@ int sigqueue(pid_t pid, int signo, const sigval value) { info.si_uid = getuid(); info.si_value = value; - return __rt_sigqueueinfo(pid, signo, &info); + return ___rt_sigqueueinfo(pid, signo, &info); } -- cgit v1.1