diff options
author | Yabin Cui <yabinc@google.com> | 2015-05-18 11:19:11 -0700 |
---|---|---|
committer | Yabin Cui <yabinc@google.com> | 2015-05-18 13:34:51 -0700 |
commit | 7490c5c5944391e99bc6c3564bce03d3cd4a39e0 (patch) | |
tree | 9ee0784b73bfb965fdb56b5728429b6a076a5a6a | |
parent | 2b5c2285c0679190b90b954d5e71f7ee8698adba (diff) | |
download | bionic-7490c5c5944391e99bc6c3564bce03d3cd4a39e0.zip bionic-7490c5c5944391e99bc6c3564bce03d3cd4a39e0.tar.gz bionic-7490c5c5944391e99bc6c3564bce03d3cd4a39e0.tar.bz2 |
Hide rt_sigqueueinfo.
Bug: 19358804
Change-Id: I38a53ad64c81d0eefdd1d24599e769fd8a477a56
(cherry picked from commit 40a8f214a5264efe5feaaffd55cea67fb87d097b)
-rw-r--r-- | libc/SYSCALLS.TXT | 2 | ||||
-rw-r--r-- | libc/arch-arm/syscalls/___rt_sigqueueinfo.S (renamed from libc/arch-arm/syscalls/__rt_sigqueueinfo.S) | 5 | ||||
-rw-r--r-- | libc/arch-arm64/syscalls/___rt_sigqueueinfo.S (renamed from libc/arch-arm64/syscalls/__rt_sigqueueinfo.S) | 6 | ||||
-rw-r--r-- | libc/arch-mips/syscalls/___rt_sigqueueinfo.S (renamed from libc/arch-mips/syscalls/__rt_sigqueueinfo.S) | 5 | ||||
-rw-r--r-- | libc/arch-mips64/syscalls/___rt_sigqueueinfo.S (renamed from libc/arch-mips64/syscalls/__rt_sigqueueinfo.S) | 6 | ||||
-rw-r--r-- | libc/arch-x86/syscalls/___rt_sigqueueinfo.S (renamed from libc/arch-x86/syscalls/__rt_sigqueueinfo.S) | 5 | ||||
-rw-r--r-- | libc/arch-x86_64/syscalls/___rt_sigqueueinfo.S (renamed from libc/arch-x86_64/syscalls/__rt_sigqueueinfo.S) | 6 | ||||
-rw-r--r-- | libc/bionic/sigqueue.cpp | 4 |
8 files changed, 21 insertions, 18 deletions
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 index c823cee..25b0d57 100644 --- a/libc/arch-arm/syscalls/__rt_sigqueueinfo.S +++ b/libc/arch-arm/syscalls/___rt_sigqueueinfo.S @@ -2,7 +2,7 @@ #include <private/bionic_asm.h> -ENTRY(__rt_sigqueueinfo) +ENTRY(___rt_sigqueueinfo) mov ip, r7 ldr r7, =__NR_rt_sigqueueinfo swi #0 @@ -11,4 +11,5 @@ ENTRY(__rt_sigqueueinfo) bxls lr neg r0, r0 b __set_errno_internal -END(__rt_sigqueueinfo) +END(___rt_sigqueueinfo) +.hidden ___rt_sigqueueinfo diff --git a/libc/arch-arm64/syscalls/__rt_sigqueueinfo.S b/libc/arch-arm64/syscalls/___rt_sigqueueinfo.S index 2b23e18..85ea132 100644 --- a/libc/arch-arm64/syscalls/__rt_sigqueueinfo.S +++ b/libc/arch-arm64/syscalls/___rt_sigqueueinfo.S @@ -2,7 +2,7 @@ #include <private/bionic_asm.h> -ENTRY(__rt_sigqueueinfo) +ENTRY(___rt_sigqueueinfo) mov x8, __NR_rt_sigqueueinfo svc #0 @@ -11,5 +11,5 @@ ENTRY(__rt_sigqueueinfo) b.hi __set_errno_internal ret -END(__rt_sigqueueinfo) -.hidden __rt_sigqueueinfo +END(___rt_sigqueueinfo) +.hidden ___rt_sigqueueinfo diff --git a/libc/arch-mips/syscalls/__rt_sigqueueinfo.S b/libc/arch-mips/syscalls/___rt_sigqueueinfo.S index a978bc4..95af36f 100644 --- a/libc/arch-mips/syscalls/__rt_sigqueueinfo.S +++ b/libc/arch-mips/syscalls/___rt_sigqueueinfo.S @@ -2,7 +2,7 @@ #include <private/bionic_asm.h> -ENTRY(__rt_sigqueueinfo) +ENTRY(___rt_sigqueueinfo) .set noreorder .cpload t9 li v0, __NR_rt_sigqueueinfo @@ -16,4 +16,5 @@ ENTRY(__rt_sigqueueinfo) j t9 nop .set reorder -END(__rt_sigqueueinfo) +END(___rt_sigqueueinfo) +.hidden ___rt_sigqueueinfo diff --git a/libc/arch-mips64/syscalls/__rt_sigqueueinfo.S b/libc/arch-mips64/syscalls/___rt_sigqueueinfo.S index e97aeba..1503f51 100644 --- a/libc/arch-mips64/syscalls/__rt_sigqueueinfo.S +++ b/libc/arch-mips64/syscalls/___rt_sigqueueinfo.S @@ -2,7 +2,7 @@ #include <private/bionic_asm.h> -ENTRY(__rt_sigqueueinfo) +ENTRY(___rt_sigqueueinfo) .set push .set noreorder li v0, __NR_rt_sigqueueinfo @@ -22,5 +22,5 @@ ENTRY(__rt_sigqueueinfo) j t9 move ra, t0 .set pop -END(__rt_sigqueueinfo) -.hidden __rt_sigqueueinfo +END(___rt_sigqueueinfo) +.hidden ___rt_sigqueueinfo diff --git a/libc/arch-x86/syscalls/__rt_sigqueueinfo.S b/libc/arch-x86/syscalls/___rt_sigqueueinfo.S index 4152100..97d167f 100644 --- a/libc/arch-x86/syscalls/__rt_sigqueueinfo.S +++ b/libc/arch-x86/syscalls/___rt_sigqueueinfo.S @@ -2,7 +2,7 @@ #include <private/bionic_asm.h> -ENTRY(__rt_sigqueueinfo) +ENTRY(___rt_sigqueueinfo) pushl %ebx .cfi_def_cfa_offset 8 .cfi_rel_offset ebx, 0 @@ -28,4 +28,5 @@ ENTRY(__rt_sigqueueinfo) popl %ecx popl %ebx ret -END(__rt_sigqueueinfo) +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 index 52b6863..8c6b30b 100644 --- a/libc/arch-x86_64/syscalls/__rt_sigqueueinfo.S +++ b/libc/arch-x86_64/syscalls/___rt_sigqueueinfo.S @@ -2,7 +2,7 @@ #include <private/bionic_asm.h> -ENTRY(__rt_sigqueueinfo) +ENTRY(___rt_sigqueueinfo) movl $__NR_rt_sigqueueinfo, %eax syscall cmpq $-MAX_ERRNO, %rax @@ -12,5 +12,5 @@ ENTRY(__rt_sigqueueinfo) call __set_errno_internal 1: ret -END(__rt_sigqueueinfo) -.hidden __rt_sigqueueinfo +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 <sys/types.h> #include <unistd.h> -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); } |