From 6e599a904b1f033cfaf79febff686f6296089a7d Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 22 May 2014 13:40:49 -0700 Subject: [PATCH] Remove the tkill(2) stub. glibc doesn't have tkill or tgkill and says "use syscall(3) instead". I've left tgkill since it's quite widely used, but there's no reason to have tkill as well. Bug: 11156955 Change-Id: Ifc0af750320086f829bc9914551c172b501f3b60 --- libc/SYSCALLS.TXT | 1 - libc/arch-arm/syscalls/tkill.S | 14 -------------- libc/arch-arm64/syscalls/tkill.S | 25 ------------------------- libc/arch-mips/syscalls/tkill.S | 19 ------------------- libc/arch-mips64/syscalls/tkill.S | 25 ------------------------- libc/arch-x86/syscalls/tkill.S | 26 -------------------------- libc/arch-x86_64/syscalls/tkill.S | 16 ---------------- 7 files changed, 126 deletions(-) delete mode 100644 libc/arch-arm/syscalls/tkill.S delete mode 100644 libc/arch-arm64/syscalls/tkill.S delete mode 100644 libc/arch-mips/syscalls/tkill.S delete mode 100644 libc/arch-mips64/syscalls/tkill.S delete mode 100644 libc/arch-x86/syscalls/tkill.S delete mode 100644 libc/arch-x86_64/syscalls/tkill.S diff --git a/libc/SYSCALLS.TXT b/libc/SYSCALLS.TXT index 71d76e3cd..60cf98019 100644 --- a/libc/SYSCALLS.TXT +++ b/libc/SYSCALLS.TXT @@ -58,7 +58,6 @@ int setresgid:setresgid32(gid_t, gid_t, gid_t) arm,x86 int setresgid:setresgid(gid_t, gid_t, gid_t) arm64,mips,mips64,x86_64 void* __brk:brk(void*) all int kill(pid_t, int) all -int tkill(pid_t tid, int sig) all int tgkill(pid_t tgid, pid_t tid, int sig) all int __ptrace:ptrace(int request, int pid, void* addr, void* data) all diff --git a/libc/arch-arm/syscalls/tkill.S b/libc/arch-arm/syscalls/tkill.S deleted file mode 100644 index 2626ae74f..000000000 --- a/libc/arch-arm/syscalls/tkill.S +++ /dev/null @@ -1,14 +0,0 @@ -/* Generated by gensyscalls.py. Do not edit. */ - -#include - -ENTRY(tkill) - mov ip, r7 - ldr r7, =__NR_tkill - swi #0 - mov r7, ip - cmn r0, #(MAX_ERRNO + 1) - bxls lr - neg r0, r0 - b __set_errno -END(tkill) diff --git a/libc/arch-arm64/syscalls/tkill.S b/libc/arch-arm64/syscalls/tkill.S deleted file mode 100644 index 307bd1498..000000000 --- a/libc/arch-arm64/syscalls/tkill.S +++ /dev/null @@ -1,25 +0,0 @@ -/* Generated by gensyscalls.py. Do not edit. */ - -#include - -ENTRY(tkill) - stp x29, x30, [sp, #-16]! - .cfi_def_cfa_offset 16 - .cfi_rel_offset x29, 0 - .cfi_rel_offset x30, 8 - mov x29, sp - - mov x8, __NR_tkill - svc #0 - - ldp x29, x30, [sp], #16 - .cfi_def_cfa_offset 0 - .cfi_restore x29 - .cfi_restore x30 - - cmn x0, #(MAX_ERRNO + 1) - cneg x0, x0, hi - b.hi __set_errno - - ret -END(tkill) diff --git a/libc/arch-mips/syscalls/tkill.S b/libc/arch-mips/syscalls/tkill.S deleted file mode 100644 index c1ecb61a8..000000000 --- a/libc/arch-mips/syscalls/tkill.S +++ /dev/null @@ -1,19 +0,0 @@ -/* Generated by gensyscalls.py. Do not edit. */ - -#include - -ENTRY(tkill) - .set noreorder - .cpload t9 - li v0, __NR_tkill - syscall - bnez a3, 1f - move a0, v0 - j ra - nop -1: - la t9,__set_errno - j t9 - nop - .set reorder -END(tkill) diff --git a/libc/arch-mips64/syscalls/tkill.S b/libc/arch-mips64/syscalls/tkill.S deleted file mode 100644 index 14d6903e6..000000000 --- a/libc/arch-mips64/syscalls/tkill.S +++ /dev/null @@ -1,25 +0,0 @@ -/* Generated by gensyscalls.py. Do not edit. */ - -#include - -ENTRY(tkill) - .set push - .set noreorder - li v0, __NR_tkill - 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 - .cpreturn - j t9 - move ra, t0 - .set pop -END(tkill) diff --git a/libc/arch-x86/syscalls/tkill.S b/libc/arch-x86/syscalls/tkill.S deleted file mode 100644 index f8da3697d..000000000 --- a/libc/arch-x86/syscalls/tkill.S +++ /dev/null @@ -1,26 +0,0 @@ -/* Generated by gensyscalls.py. Do not edit. */ - -#include - -ENTRY(tkill) - pushl %ebx - pushl %ecx - .cfi_def_cfa_offset 8 - .cfi_rel_offset ebx, 0 - .cfi_rel_offset ecx, 4 - mov 12(%esp), %ebx - mov 16(%esp), %ecx - movl $__NR_tkill, %eax - int $0x80 - cmpl $-MAX_ERRNO, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ecx - popl %ebx - ret -END(tkill) diff --git a/libc/arch-x86_64/syscalls/tkill.S b/libc/arch-x86_64/syscalls/tkill.S deleted file mode 100644 index d8529efee..000000000 --- a/libc/arch-x86_64/syscalls/tkill.S +++ /dev/null @@ -1,16 +0,0 @@ -/* Generated by gensyscalls.py. Do not edit. */ - -#include - -ENTRY(tkill) - movl $__NR_tkill, %eax - syscall - cmpq $-MAX_ERRNO, %rax - jb 1f - negl %eax - movl %eax, %edi - call __set_errno - orq $-1, %rax -1: - ret -END(tkill)