From 4e631ba5688db2fae7bbc476982055a376102146 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 20 May 2014 16:24:10 -0700 Subject: [PATCH] Remove perf_event_open. This was accidentally added at a time when you couldn't add a constant to without generating an assembly stub! (You no longer need to add the constants at all.) Bug: 11156955 Change-Id: I053c17879138787976c744a5ecf7d30ee51dc48f --- libc/SYSCALLS.TXT | 1 - libc/arch-arm/syscalls/perf_event_open.S | 22 ------------ libc/arch-arm64/syscalls/perf_event_open.S | 21 ------------ libc/arch-mips/syscalls/perf_event_open.S | 19 ----------- libc/arch-mips64/syscalls/perf_event_open.S | 25 -------------- libc/arch-x86/syscalls/perf_event_open.S | 38 --------------------- libc/arch-x86_64/syscalls/perf_event_open.S | 17 --------- 7 files changed, 143 deletions(-) delete mode 100644 libc/arch-arm/syscalls/perf_event_open.S delete mode 100644 libc/arch-arm64/syscalls/perf_event_open.S delete mode 100644 libc/arch-mips/syscalls/perf_event_open.S delete mode 100644 libc/arch-mips64/syscalls/perf_event_open.S delete mode 100644 libc/arch-x86/syscalls/perf_event_open.S delete mode 100644 libc/arch-x86_64/syscalls/perf_event_open.S diff --git a/libc/SYSCALLS.TXT b/libc/SYSCALLS.TXT index 2a891b7a3..694b8ae6a 100644 --- a/libc/SYSCALLS.TXT +++ b/libc/SYSCALLS.TXT @@ -297,7 +297,6 @@ int delete_module(const char*, unsigned int) all int klogctl:syslog(int, char*, int) all int sysinfo(struct sysinfo*) all int personality(unsigned long) all -long perf_event_open(struct perf_event_attr* attr_uptr, pid_t pid, int cpu, int group_fd, unsigned long flags) all int epoll_create1(int) all int epoll_ctl(int, int op, int, struct epoll_event*) all diff --git a/libc/arch-arm/syscalls/perf_event_open.S b/libc/arch-arm/syscalls/perf_event_open.S deleted file mode 100644 index 2821ac5d9..000000000 --- a/libc/arch-arm/syscalls/perf_event_open.S +++ /dev/null @@ -1,22 +0,0 @@ -/* Generated by gensyscalls.py. Do not edit. */ - -#include - -ENTRY(perf_event_open) - mov ip, sp - stmfd sp!, {r4, r5, r6, r7} - .cfi_def_cfa_offset 16 - .cfi_rel_offset r4, 0 - .cfi_rel_offset r5, 4 - .cfi_rel_offset r6, 8 - .cfi_rel_offset r7, 12 - ldmfd ip, {r4, r5, r6} - ldr r7, =__NR_perf_event_open - swi #0 - ldmfd sp!, {r4, r5, r6, r7} - .cfi_def_cfa_offset 0 - cmn r0, #(MAX_ERRNO + 1) - bxls lr - neg r0, r0 - b __set_errno -END(perf_event_open) diff --git a/libc/arch-arm64/syscalls/perf_event_open.S b/libc/arch-arm64/syscalls/perf_event_open.S deleted file mode 100644 index 396026492..000000000 --- a/libc/arch-arm64/syscalls/perf_event_open.S +++ /dev/null @@ -1,21 +0,0 @@ -/* Generated by gensyscalls.py. Do not edit. */ - -#include - -ENTRY(perf_event_open) - stp x29, x30, [sp, #-16]! - mov x29, sp - str x8, [sp, #-16]! - - mov x8, __NR_perf_event_open - svc #0 - - ldr x8, [sp], #16 - ldp x29, x30, [sp], #16 - - cmn x0, #(MAX_ERRNO + 1) - cneg x0, x0, hi - b.hi __set_errno - - ret -END(perf_event_open) diff --git a/libc/arch-mips/syscalls/perf_event_open.S b/libc/arch-mips/syscalls/perf_event_open.S deleted file mode 100644 index a0e441666..000000000 --- a/libc/arch-mips/syscalls/perf_event_open.S +++ /dev/null @@ -1,19 +0,0 @@ -/* Generated by gensyscalls.py. Do not edit. */ - -#include - -ENTRY(perf_event_open) - .set noreorder - .cpload t9 - li v0, __NR_perf_event_open - syscall - bnez a3, 1f - move a0, v0 - j ra - nop -1: - la t9,__set_errno - j t9 - nop - .set reorder -END(perf_event_open) diff --git a/libc/arch-mips64/syscalls/perf_event_open.S b/libc/arch-mips64/syscalls/perf_event_open.S deleted file mode 100644 index d796a1676..000000000 --- a/libc/arch-mips64/syscalls/perf_event_open.S +++ /dev/null @@ -1,25 +0,0 @@ -/* Generated by gensyscalls.py. Do not edit. */ - -#include - -ENTRY(perf_event_open) - .set push - .set noreorder - li v0, __NR_perf_event_open - 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(perf_event_open) diff --git a/libc/arch-x86/syscalls/perf_event_open.S b/libc/arch-x86/syscalls/perf_event_open.S deleted file mode 100644 index ebbe1f066..000000000 --- a/libc/arch-x86/syscalls/perf_event_open.S +++ /dev/null @@ -1,38 +0,0 @@ -/* Generated by gensyscalls.py. Do not edit. */ - -#include - -ENTRY(perf_event_open) - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - .cfi_def_cfa_offset 20 - .cfi_rel_offset ebx, 0 - .cfi_rel_offset ecx, 4 - .cfi_rel_offset edx, 8 - .cfi_rel_offset esi, 12 - .cfi_rel_offset edi, 16 - mov 24(%esp), %ebx - mov 28(%esp), %ecx - mov 32(%esp), %edx - mov 36(%esp), %esi - mov 40(%esp), %edi - movl $__NR_perf_event_open, %eax - int $0x80 - cmpl $-MAX_ERRNO, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - ret -END(perf_event_open) diff --git a/libc/arch-x86_64/syscalls/perf_event_open.S b/libc/arch-x86_64/syscalls/perf_event_open.S deleted file mode 100644 index d9fc71e4f..000000000 --- a/libc/arch-x86_64/syscalls/perf_event_open.S +++ /dev/null @@ -1,17 +0,0 @@ -/* Generated by gensyscalls.py. Do not edit. */ - -#include - -ENTRY(perf_event_open) - movq %rcx, %r10 - movl $__NR_perf_event_open, %eax - syscall - cmpq $-MAX_ERRNO, %rax - jb 1f - negl %eax - movl %eax, %edi - call __set_errno - orq $-1, %rax -1: - ret -END(perf_event_open)