Merge commit 'af00228b705b53165c132a22b30c2d6cbb9acd13' into mm
This commit is contained in:
commit
b11f6e0850
@ -11,6 +11,7 @@ libc_common_src_files := \
|
||||
unistd/brk.c \
|
||||
unistd/creat.c \
|
||||
unistd/daemon.c \
|
||||
unistd/eventfd.c \
|
||||
unistd/exec.c \
|
||||
unistd/fcntl.c \
|
||||
unistd/fnmatch.c \
|
||||
|
@ -33,7 +33,7 @@ void _exit:exit_group (int) 248,252
|
||||
void _exit_thread:exit (int) 1
|
||||
pid_t __fork:fork (void) 2
|
||||
pid_t _waitpid:waitpid (pid_t, int*, int, struct rusage*) -1,7
|
||||
int waitid(int, pid_t, struct siginfo_t*, int,void*) 280,284
|
||||
int __waitid:waitid(int, pid_t, struct siginfo_t*, int,void*) 280,284
|
||||
|
||||
# NOTE: this system call is never called directly, but we list it there
|
||||
# to have __NR_clone properly defined.
|
||||
@ -112,11 +112,13 @@ int flock(int, int) 143
|
||||
int fchmod(int, mode_t) 94
|
||||
int dup(int) 41
|
||||
int pipe(int *) 42,42,-1
|
||||
int pipe2(int *, int) 359,331
|
||||
int dup2(int, int) 63
|
||||
int select:_newselect(int, struct fd_set *, struct fd_set *, struct fd_set *, struct timeval *) 142
|
||||
int ftruncate(int, off_t) 93
|
||||
int getdents:getdents64(unsigned int, struct dirent *, unsigned int) 217,220
|
||||
int fsync(int) 118
|
||||
int fdatasync(int) 148
|
||||
int fchown:fchown32(int, uid_t, gid_t) 207
|
||||
void sync(void) 36
|
||||
int __fcntl64:fcntl64(int, int, void *) 221
|
||||
@ -229,8 +231,8 @@ int sched_get_priority_min(int policy) 160
|
||||
int sched_rr_get_interval(pid_t pid, struct timespec *interval) 161
|
||||
|
||||
# io priorities
|
||||
int ioprio_set(int which, int who, int ioprio) 314,289
|
||||
int ioprio_get(int which, int who) 315,290
|
||||
int ioprio_set(int which, int who, int ioprio) 314,289,288
|
||||
int ioprio_get(int which, int who) 315,290,289
|
||||
|
||||
# other
|
||||
int uname(struct utsname *) 122
|
||||
@ -257,6 +259,8 @@ int inotify_rm_watch(int, unsigned int) 318,293,292
|
||||
|
||||
int poll(struct pollfd *, unsigned int, long) 168
|
||||
|
||||
int eventfd:eventfd2(unsigned int, int) 356,328
|
||||
|
||||
# ARM-specific ARM_NR_BASE == 0x0f0000 == 983040
|
||||
int __set_tls:ARM_set_tls(void*) 983045,-1
|
||||
int cacheflush:ARM_cacheflush(long start, long end, long flags) 983042,-1
|
||||
|
@ -46,8 +46,6 @@ typedef long ssize_t;
|
||||
typedef long ptrdiff_t;
|
||||
#endif
|
||||
|
||||
//#include <linux/types.h>
|
||||
|
||||
/* 7.18.1.1 Exact-width integer types */
|
||||
typedef __signed char __int8_t;
|
||||
typedef unsigned char __uint8_t;
|
||||
|
@ -3,7 +3,7 @@ syscall_src :=
|
||||
syscall_src += arch-arm/syscalls/_exit.S
|
||||
syscall_src += arch-arm/syscalls/_exit_thread.S
|
||||
syscall_src += arch-arm/syscalls/__fork.S
|
||||
syscall_src += arch-arm/syscalls/waitid.S
|
||||
syscall_src += arch-arm/syscalls/__waitid.S
|
||||
syscall_src += arch-arm/syscalls/__sys_clone.S
|
||||
syscall_src += arch-arm/syscalls/execve.S
|
||||
syscall_src += arch-arm/syscalls/__setuid.S
|
||||
@ -66,11 +66,13 @@ syscall_src += arch-arm/syscalls/flock.S
|
||||
syscall_src += arch-arm/syscalls/fchmod.S
|
||||
syscall_src += arch-arm/syscalls/dup.S
|
||||
syscall_src += arch-arm/syscalls/pipe.S
|
||||
syscall_src += arch-arm/syscalls/pipe2.S
|
||||
syscall_src += arch-arm/syscalls/dup2.S
|
||||
syscall_src += arch-arm/syscalls/select.S
|
||||
syscall_src += arch-arm/syscalls/ftruncate.S
|
||||
syscall_src += arch-arm/syscalls/getdents.S
|
||||
syscall_src += arch-arm/syscalls/fsync.S
|
||||
syscall_src += arch-arm/syscalls/fdatasync.S
|
||||
syscall_src += arch-arm/syscalls/fchown.S
|
||||
syscall_src += arch-arm/syscalls/sync.S
|
||||
syscall_src += arch-arm/syscalls/__fcntl64.S
|
||||
@ -170,5 +172,6 @@ syscall_src += arch-arm/syscalls/inotify_init.S
|
||||
syscall_src += arch-arm/syscalls/inotify_add_watch.S
|
||||
syscall_src += arch-arm/syscalls/inotify_rm_watch.S
|
||||
syscall_src += arch-arm/syscalls/poll.S
|
||||
syscall_src += arch-arm/syscalls/eventfd.S
|
||||
syscall_src += arch-arm/syscalls/__set_tls.S
|
||||
syscall_src += arch-arm/syscalls/cacheflush.S
|
||||
|
@ -2,12 +2,12 @@
|
||||
#include <sys/linux-syscalls.h>
|
||||
|
||||
.text
|
||||
.type waitid, #function
|
||||
.globl waitid
|
||||
.type __waitid, #function
|
||||
.globl __waitid
|
||||
.align 4
|
||||
.fnstart
|
||||
|
||||
waitid:
|
||||
__waitid:
|
||||
mov ip, sp
|
||||
.save {r4, r5, r6, r7}
|
||||
stmfd sp!, {r4, r5, r6, r7}
|
19
libc/arch-arm/syscalls/eventfd.S
Normal file
19
libc/arch-arm/syscalls/eventfd.S
Normal file
@ -0,0 +1,19 @@
|
||||
/* autogenerated by gensyscalls.py */
|
||||
#include <sys/linux-syscalls.h>
|
||||
|
||||
.text
|
||||
.type eventfd, #function
|
||||
.globl eventfd
|
||||
.align 4
|
||||
.fnstart
|
||||
|
||||
eventfd:
|
||||
.save {r4, r7}
|
||||
stmfd sp!, {r4, r7}
|
||||
ldr r7, =__NR_eventfd2
|
||||
swi #0
|
||||
ldmfd sp!, {r4, r7}
|
||||
movs r0, r0
|
||||
bxpl lr
|
||||
b __set_syscall_errno
|
||||
.fnend
|
19
libc/arch-arm/syscalls/fdatasync.S
Normal file
19
libc/arch-arm/syscalls/fdatasync.S
Normal file
@ -0,0 +1,19 @@
|
||||
/* autogenerated by gensyscalls.py */
|
||||
#include <sys/linux-syscalls.h>
|
||||
|
||||
.text
|
||||
.type fdatasync, #function
|
||||
.globl fdatasync
|
||||
.align 4
|
||||
.fnstart
|
||||
|
||||
fdatasync:
|
||||
.save {r4, r7}
|
||||
stmfd sp!, {r4, r7}
|
||||
ldr r7, =__NR_fdatasync
|
||||
swi #0
|
||||
ldmfd sp!, {r4, r7}
|
||||
movs r0, r0
|
||||
bxpl lr
|
||||
b __set_syscall_errno
|
||||
.fnend
|
19
libc/arch-arm/syscalls/pipe2.S
Normal file
19
libc/arch-arm/syscalls/pipe2.S
Normal file
@ -0,0 +1,19 @@
|
||||
/* autogenerated by gensyscalls.py */
|
||||
#include <sys/linux-syscalls.h>
|
||||
|
||||
.text
|
||||
.type pipe2, #function
|
||||
.globl pipe2
|
||||
.align 4
|
||||
.fnstart
|
||||
|
||||
pipe2:
|
||||
.save {r4, r7}
|
||||
stmfd sp!, {r4, r7}
|
||||
ldr r7, =__NR_pipe2
|
||||
swi #0
|
||||
ldmfd sp!, {r4, r7}
|
||||
movs r0, r0
|
||||
bxpl lr
|
||||
b __set_syscall_errno
|
||||
.fnend
|
@ -4,7 +4,7 @@ syscall_src += arch-sh/syscalls/_exit.S
|
||||
syscall_src += arch-sh/syscalls/_exit_thread.S
|
||||
syscall_src += arch-sh/syscalls/__fork.S
|
||||
syscall_src += arch-sh/syscalls/_waitpid.S
|
||||
syscall_src += arch-sh/syscalls/waitid.S
|
||||
syscall_src += arch-sh/syscalls/__waitid.S
|
||||
syscall_src += arch-sh/syscalls/__sys_clone.S
|
||||
syscall_src += arch-sh/syscalls/execve.S
|
||||
syscall_src += arch-sh/syscalls/__setuid.S
|
||||
@ -69,11 +69,13 @@ syscall_src += arch-sh/syscalls/__fcntl.S
|
||||
syscall_src += arch-sh/syscalls/flock.S
|
||||
syscall_src += arch-sh/syscalls/fchmod.S
|
||||
syscall_src += arch-sh/syscalls/dup.S
|
||||
syscall_src += arch-sh/syscalls/pipe2.S
|
||||
syscall_src += arch-sh/syscalls/dup2.S
|
||||
syscall_src += arch-sh/syscalls/select.S
|
||||
syscall_src += arch-sh/syscalls/ftruncate.S
|
||||
syscall_src += arch-sh/syscalls/getdents.S
|
||||
syscall_src += arch-sh/syscalls/fsync.S
|
||||
syscall_src += arch-sh/syscalls/fdatasync.S
|
||||
syscall_src += arch-sh/syscalls/fchown.S
|
||||
syscall_src += arch-sh/syscalls/sync.S
|
||||
syscall_src += arch-sh/syscalls/__fcntl64.S
|
||||
@ -159,3 +161,4 @@ syscall_src += arch-sh/syscalls/inotify_init.S
|
||||
syscall_src += arch-sh/syscalls/inotify_add_watch.S
|
||||
syscall_src += arch-sh/syscalls/inotify_rm_watch.S
|
||||
syscall_src += arch-sh/syscalls/poll.S
|
||||
syscall_src += arch-sh/syscalls/eventfd.S
|
||||
|
@ -2,11 +2,11 @@
|
||||
#include <sys/linux-syscalls.h>
|
||||
|
||||
.text
|
||||
.type waitid, @function
|
||||
.globl waitid
|
||||
.type __waitid, @function
|
||||
.globl __waitid
|
||||
.align 4
|
||||
|
||||
waitid:
|
||||
__waitid:
|
||||
|
||||
/* get ready for additonal arg */
|
||||
mov.l @r15, r0
|
32
libc/arch-sh/syscalls/eventfd.S
Normal file
32
libc/arch-sh/syscalls/eventfd.S
Normal file
@ -0,0 +1,32 @@
|
||||
/* autogenerated by gensyscalls.py */
|
||||
#include <sys/linux-syscalls.h>
|
||||
|
||||
.text
|
||||
.type eventfd, @function
|
||||
.globl eventfd
|
||||
.align 4
|
||||
|
||||
eventfd:
|
||||
|
||||
/* invoke trap */
|
||||
mov.l 0f, r3 /* trap num */
|
||||
trapa #(2 + 0x10)
|
||||
|
||||
/* check return value */
|
||||
cmp/pz r0
|
||||
bt __NR_eventfd2_end
|
||||
|
||||
/* keep error number */
|
||||
sts.l pr, @-r15
|
||||
mov.l 1f, r1
|
||||
jsr @r1
|
||||
mov r0, r4
|
||||
lds.l @r15+, pr
|
||||
|
||||
__NR_eventfd2_end:
|
||||
rts
|
||||
nop
|
||||
|
||||
.align 2
|
||||
0: .long __NR_eventfd2
|
||||
1: .long __set_syscall_errno
|
32
libc/arch-sh/syscalls/fdatasync.S
Normal file
32
libc/arch-sh/syscalls/fdatasync.S
Normal file
@ -0,0 +1,32 @@
|
||||
/* autogenerated by gensyscalls.py */
|
||||
#include <sys/linux-syscalls.h>
|
||||
|
||||
.text
|
||||
.type fdatasync, @function
|
||||
.globl fdatasync
|
||||
.align 4
|
||||
|
||||
fdatasync:
|
||||
|
||||
/* invoke trap */
|
||||
mov.l 0f, r3 /* trap num */
|
||||
trapa #(1 + 0x10)
|
||||
|
||||
/* check return value */
|
||||
cmp/pz r0
|
||||
bt __NR_fdatasync_end
|
||||
|
||||
/* keep error number */
|
||||
sts.l pr, @-r15
|
||||
mov.l 1f, r1
|
||||
jsr @r1
|
||||
mov r0, r4
|
||||
lds.l @r15+, pr
|
||||
|
||||
__NR_fdatasync_end:
|
||||
rts
|
||||
nop
|
||||
|
||||
.align 2
|
||||
0: .long __NR_fdatasync
|
||||
1: .long __set_syscall_errno
|
32
libc/arch-sh/syscalls/pipe2.S
Normal file
32
libc/arch-sh/syscalls/pipe2.S
Normal file
@ -0,0 +1,32 @@
|
||||
/* autogenerated by gensyscalls.py */
|
||||
#include <sys/linux-syscalls.h>
|
||||
|
||||
.text
|
||||
.type pipe2, @function
|
||||
.globl pipe2
|
||||
.align 4
|
||||
|
||||
pipe2:
|
||||
|
||||
/* invoke trap */
|
||||
mov.l 0f, r3 /* trap num */
|
||||
trapa #(2 + 0x10)
|
||||
|
||||
/* check return value */
|
||||
cmp/pz r0
|
||||
bt __NR_pipe2_end
|
||||
|
||||
/* keep error number */
|
||||
sts.l pr, @-r15
|
||||
mov.l 1f, r1
|
||||
jsr @r1
|
||||
mov r0, r4
|
||||
lds.l @r15+, pr
|
||||
|
||||
__NR_pipe2_end:
|
||||
rts
|
||||
nop
|
||||
|
||||
.align 2
|
||||
0: .long __NR_pipe2
|
||||
1: .long __set_syscall_errno
|
@ -4,7 +4,7 @@ syscall_src += arch-x86/syscalls/_exit.S
|
||||
syscall_src += arch-x86/syscalls/_exit_thread.S
|
||||
syscall_src += arch-x86/syscalls/__fork.S
|
||||
syscall_src += arch-x86/syscalls/_waitpid.S
|
||||
syscall_src += arch-x86/syscalls/waitid.S
|
||||
syscall_src += arch-x86/syscalls/__waitid.S
|
||||
syscall_src += arch-x86/syscalls/__sys_clone.S
|
||||
syscall_src += arch-x86/syscalls/execve.S
|
||||
syscall_src += arch-x86/syscalls/__setuid.S
|
||||
@ -69,11 +69,13 @@ syscall_src += arch-x86/syscalls/flock.S
|
||||
syscall_src += arch-x86/syscalls/fchmod.S
|
||||
syscall_src += arch-x86/syscalls/dup.S
|
||||
syscall_src += arch-x86/syscalls/pipe.S
|
||||
syscall_src += arch-x86/syscalls/pipe2.S
|
||||
syscall_src += arch-x86/syscalls/dup2.S
|
||||
syscall_src += arch-x86/syscalls/select.S
|
||||
syscall_src += arch-x86/syscalls/ftruncate.S
|
||||
syscall_src += arch-x86/syscalls/getdents.S
|
||||
syscall_src += arch-x86/syscalls/fsync.S
|
||||
syscall_src += arch-x86/syscalls/fdatasync.S
|
||||
syscall_src += arch-x86/syscalls/fchown.S
|
||||
syscall_src += arch-x86/syscalls/sync.S
|
||||
syscall_src += arch-x86/syscalls/__fcntl64.S
|
||||
@ -173,3 +175,4 @@ syscall_src += arch-x86/syscalls/inotify_init.S
|
||||
syscall_src += arch-x86/syscalls/inotify_add_watch.S
|
||||
syscall_src += arch-x86/syscalls/inotify_rm_watch.S
|
||||
syscall_src += arch-x86/syscalls/poll.S
|
||||
syscall_src += arch-x86/syscalls/eventfd.S
|
||||
|
@ -2,11 +2,11 @@
|
||||
#include <sys/linux-syscalls.h>
|
||||
|
||||
.text
|
||||
.type waitid, @function
|
||||
.globl waitid
|
||||
.type __waitid, @function
|
||||
.globl __waitid
|
||||
.align 4
|
||||
|
||||
waitid:
|
||||
__waitid:
|
||||
pushl %ebx
|
||||
pushl %ecx
|
||||
pushl %edx
|
26
libc/arch-x86/syscalls/eventfd.S
Normal file
26
libc/arch-x86/syscalls/eventfd.S
Normal file
@ -0,0 +1,26 @@
|
||||
/* autogenerated by gensyscalls.py */
|
||||
#include <sys/linux-syscalls.h>
|
||||
|
||||
.text
|
||||
.type eventfd, @function
|
||||
.globl eventfd
|
||||
.align 4
|
||||
|
||||
eventfd:
|
||||
pushl %ebx
|
||||
pushl %ecx
|
||||
mov 12(%esp), %ebx
|
||||
mov 16(%esp), %ecx
|
||||
movl $__NR_eventfd2, %eax
|
||||
int $0x80
|
||||
cmpl $-129, %eax
|
||||
jb 1f
|
||||
negl %eax
|
||||
pushl %eax
|
||||
call __set_errno
|
||||
addl $4, %esp
|
||||
orl $-1, %eax
|
||||
1:
|
||||
popl %ecx
|
||||
popl %ebx
|
||||
ret
|
23
libc/arch-x86/syscalls/fdatasync.S
Normal file
23
libc/arch-x86/syscalls/fdatasync.S
Normal file
@ -0,0 +1,23 @@
|
||||
/* autogenerated by gensyscalls.py */
|
||||
#include <sys/linux-syscalls.h>
|
||||
|
||||
.text
|
||||
.type fdatasync, @function
|
||||
.globl fdatasync
|
||||
.align 4
|
||||
|
||||
fdatasync:
|
||||
pushl %ebx
|
||||
mov 8(%esp), %ebx
|
||||
movl $__NR_fdatasync, %eax
|
||||
int $0x80
|
||||
cmpl $-129, %eax
|
||||
jb 1f
|
||||
negl %eax
|
||||
pushl %eax
|
||||
call __set_errno
|
||||
addl $4, %esp
|
||||
orl $-1, %eax
|
||||
1:
|
||||
popl %ebx
|
||||
ret
|
26
libc/arch-x86/syscalls/pipe2.S
Normal file
26
libc/arch-x86/syscalls/pipe2.S
Normal file
@ -0,0 +1,26 @@
|
||||
/* autogenerated by gensyscalls.py */
|
||||
#include <sys/linux-syscalls.h>
|
||||
|
||||
.text
|
||||
.type pipe2, @function
|
||||
.globl pipe2
|
||||
.align 4
|
||||
|
||||
pipe2:
|
||||
pushl %ebx
|
||||
pushl %ecx
|
||||
mov 12(%esp), %ebx
|
||||
mov 16(%esp), %ecx
|
||||
movl $__NR_pipe2, %eax
|
||||
int $0x80
|
||||
cmpl $-129, %eax
|
||||
jb 1f
|
||||
negl %eax
|
||||
pushl %eax
|
||||
call __set_errno
|
||||
addl $4, %esp
|
||||
orl $-1, %eax
|
||||
1:
|
||||
popl %ecx
|
||||
popl %ebx
|
||||
ret
|
@ -39,6 +39,10 @@ __BEGIN_DECLS
|
||||
#define O_ASYNC FASYNC
|
||||
#endif
|
||||
|
||||
#ifndef O_CLOEXEC
|
||||
#define O_CLOEXEC 02000000
|
||||
#endif
|
||||
|
||||
extern int open(const char* path, int mode, ...);
|
||||
extern int openat(int fd, const char* path, int mode, ...);
|
||||
extern int unlinkat(int dirfd, const char *pathname, int flags);
|
||||
|
@ -28,6 +28,10 @@
|
||||
#ifndef _PATHCONF_H_
|
||||
#define _PATHCONF_H_
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
||||
/* constants to be used for the 'name' paremeter of pathconf/fpathconf */
|
||||
|
||||
#define _PC_FILESIZEBITS 0x0000
|
||||
@ -54,5 +58,7 @@
|
||||
extern long fpathconf(int fildes, int name);
|
||||
extern long pathconf(const char *path, int name);
|
||||
|
||||
__END_DECLS
|
||||
|
||||
#endif /* _PATHCONF_H_ */
|
||||
|
||||
|
@ -309,4 +309,4 @@ extern void __pthread_cleanup_pop(__pthread_cleanup_t* c,
|
||||
#define LONG_LONG_MAX __LONG_LONG_MAX__
|
||||
#define LONG_LONG_MIN (-__LONG_LONG_MAX__ - 1)
|
||||
|
||||
#endif // _PTHREAD_H_
|
||||
#endif /* _PTHREAD_H_ */
|
||||
|
50
libc/include/sys/eventfd.h
Normal file
50
libc/include/sys/eventfd.h
Normal file
@ -0,0 +1,50 @@
|
||||
/*
|
||||
* Copyright (C) 2008 The Android Open Source Project
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
||||
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
#ifndef _SYS_EVENTFD_H
|
||||
#define _SYS_EVENTFD_H
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
||||
#define EFD_CLOEXEC O_CLOEXEC
|
||||
#define EFD_NONBLOCK O_NONBLOCK
|
||||
|
||||
/* type of event counter */
|
||||
typedef uint64_t eventfd_t;
|
||||
|
||||
extern int eventfd(unsigned int initval, int flags);
|
||||
|
||||
/* Compatibility with GLibc */
|
||||
extern int eventfd_read(int fd, eventfd_t *counter);
|
||||
extern int eventfd_write(int fd, const eventfd_t counter);
|
||||
|
||||
__END_DECLS
|
||||
|
||||
#endif /* _SYS_EVENTFD_H */
|
@ -31,7 +31,7 @@
|
||||
#include <sys/cdefs.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
// ANDROID: needed for flock()
|
||||
/* ANDROID: needed for flock() */
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
|
@ -39,8 +39,8 @@
|
||||
#ifndef _SYS_IOCTL_COMPAT_H_
|
||||
#define _SYS_IOCTL_COMPAT_H_
|
||||
|
||||
//#include <sys/ttychars.h>
|
||||
//#include <sys/ttydev.h>
|
||||
/*#include <sys/ttychars.h>*/
|
||||
/*#include <sys/ttydev.h>*/
|
||||
|
||||
struct tchars {
|
||||
char t_intrc; /* interrupt */
|
||||
|
@ -72,6 +72,7 @@
|
||||
#define __NR__newselect (__NR_SYSCALL_BASE + 142)
|
||||
#define __NR_ftruncate (__NR_SYSCALL_BASE + 93)
|
||||
#define __NR_fsync (__NR_SYSCALL_BASE + 118)
|
||||
#define __NR_fdatasync (__NR_SYSCALL_BASE + 148)
|
||||
#define __NR_fchown32 (__NR_SYSCALL_BASE + 207)
|
||||
#define __NR_sync (__NR_SYSCALL_BASE + 36)
|
||||
#define __NR_fcntl64 (__NR_SYSCALL_BASE + 221)
|
||||
@ -138,6 +139,7 @@
|
||||
#define __NR_openat (__NR_SYSCALL_BASE + 322)
|
||||
#define __NR_madvise (__NR_SYSCALL_BASE + 220)
|
||||
#define __NR_mincore (__NR_SYSCALL_BASE + 219)
|
||||
#define __NR_pipe2 (__NR_SYSCALL_BASE + 359)
|
||||
#define __NR_getdents64 (__NR_SYSCALL_BASE + 217)
|
||||
#define __NR_fstatfs64 (__NR_SYSCALL_BASE + 267)
|
||||
#define __NR_fstatat64 (__NR_SYSCALL_BASE + 327)
|
||||
@ -180,6 +182,7 @@
|
||||
#define __NR_inotify_init (__NR_SYSCALL_BASE + 316)
|
||||
#define __NR_inotify_add_watch (__NR_SYSCALL_BASE + 317)
|
||||
#define __NR_inotify_rm_watch (__NR_SYSCALL_BASE + 318)
|
||||
#define __NR_eventfd2 (__NR_SYSCALL_BASE + 356)
|
||||
#define __NR_ARM_set_tls (__NR_SYSCALL_BASE + 983045)
|
||||
#define __NR_ARM_cacheflush (__NR_SYSCALL_BASE + 983042)
|
||||
#endif
|
||||
@ -194,6 +197,7 @@
|
||||
#define __NR_openat (__NR_SYSCALL_BASE + 295)
|
||||
#define __NR_madvise (__NR_SYSCALL_BASE + 219)
|
||||
#define __NR_mincore (__NR_SYSCALL_BASE + 218)
|
||||
#define __NR_pipe2 (__NR_SYSCALL_BASE + 331)
|
||||
#define __NR_getdents64 (__NR_SYSCALL_BASE + 220)
|
||||
#define __NR_fstatfs64 (__NR_SYSCALL_BASE + 269)
|
||||
#define __NR_fstatat64 (__NR_SYSCALL_BASE + 300)
|
||||
@ -222,6 +226,7 @@
|
||||
#define __NR_inotify_init (__NR_SYSCALL_BASE + 291)
|
||||
#define __NR_inotify_add_watch (__NR_SYSCALL_BASE + 292)
|
||||
#define __NR_inotify_rm_watch (__NR_SYSCALL_BASE + 293)
|
||||
#define __NR_eventfd2 (__NR_SYSCALL_BASE + 328)
|
||||
#endif
|
||||
|
||||
#if defined(__SH3__) || defined(__SH4__)
|
||||
@ -235,6 +240,7 @@
|
||||
#define __NR_openat (__NR_SYSCALL_BASE + 295)
|
||||
#define __NR_madvise (__NR_SYSCALL_BASE + 219)
|
||||
#define __NR_mincore (__NR_SYSCALL_BASE + 218)
|
||||
#define __NR_pipe2 (__NR_SYSCALL_BASE + 331)
|
||||
#define __NR_getdents64 (__NR_SYSCALL_BASE + 220)
|
||||
#define __NR_fstatfs64 (__NR_SYSCALL_BASE + 269)
|
||||
#define __NR_fstatat64 (__NR_SYSCALL_BASE + 300)
|
||||
@ -270,14 +276,15 @@
|
||||
#define __NR_socketcall (__NR_SYSCALL_BASE + 102)
|
||||
#define __NR_socketcall (__NR_SYSCALL_BASE + 102)
|
||||
#define __NR___socketcall (__NR_SYSCALL_BASE + 102)
|
||||
#define __NR_ioprio_set (__NR_SYSCALL_BASE + 289)
|
||||
#define __NR_ioprio_get (__NR_SYSCALL_BASE + 290)
|
||||
#define __NR_ioprio_set (__NR_SYSCALL_BASE + 288)
|
||||
#define __NR_ioprio_get (__NR_SYSCALL_BASE + 289)
|
||||
#define __NR_epoll_create (__NR_SYSCALL_BASE + 254)
|
||||
#define __NR_epoll_ctl (__NR_SYSCALL_BASE + 255)
|
||||
#define __NR_epoll_wait (__NR_SYSCALL_BASE + 256)
|
||||
#define __NR_inotify_init (__NR_SYSCALL_BASE + 290)
|
||||
#define __NR_inotify_add_watch (__NR_SYSCALL_BASE + 291)
|
||||
#define __NR_inotify_rm_watch (__NR_SYSCALL_BASE + 292)
|
||||
#define __NR_eventfd2 (__NR_SYSCALL_BASE + 328)
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
@ -9,7 +9,7 @@ void _exit (int);
|
||||
void _exit_thread (int);
|
||||
pid_t __fork (void);
|
||||
pid_t _waitpid (pid_t, int*, int, struct rusage*);
|
||||
int waitid (int, pid_t, struct siginfo_t*, int,void*);
|
||||
int __waitid (int, pid_t, struct siginfo_t*, int,void*);
|
||||
pid_t __sys_clone (int, void*, int*, void*, int*);
|
||||
int execve (const char*, char* const*, char* const*);
|
||||
int __setuid (uid_t);
|
||||
@ -79,11 +79,13 @@ int flock (int, int);
|
||||
int fchmod (int, mode_t);
|
||||
int dup (int);
|
||||
int pipe (int *);
|
||||
int pipe2 (int *, int);
|
||||
int dup2 (int, int);
|
||||
int select (int, struct fd_set *, struct fd_set *, struct fd_set *, struct timeval *);
|
||||
int ftruncate (int, off_t);
|
||||
int getdents (unsigned int, struct dirent *, unsigned int);
|
||||
int fsync (int);
|
||||
int fdatasync (int);
|
||||
int fchown (int, uid_t, gid_t);
|
||||
void sync (void);
|
||||
int __fcntl64 (int, int, void *);
|
||||
@ -200,6 +202,7 @@ int inotify_init (void);
|
||||
int inotify_add_watch (int, const char *, unsigned int);
|
||||
int inotify_rm_watch (int, unsigned int);
|
||||
int poll (struct pollfd *, unsigned int, long);
|
||||
int eventfd (unsigned int, int);
|
||||
int __set_tls (void*);
|
||||
int cacheflush (long start, long end, long flags);
|
||||
#ifdef __cplusplus
|
||||
|
@ -30,7 +30,7 @@
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
#include <sys/types.h>
|
||||
// For all of the defines
|
||||
/* For all of the defines */
|
||||
#include <linux/ptrace.h>
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
@ -32,6 +32,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/resource.h>
|
||||
#include <linux/wait.h>
|
||||
#include <signal.h>
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
||||
@ -49,6 +50,14 @@ extern pid_t waitpid(pid_t, int *, int);
|
||||
extern pid_t wait3(int *, int, struct rusage *);
|
||||
extern pid_t wait4(pid_t, int *, int, struct rusage *);
|
||||
|
||||
/* Posix states that idtype_t should be an enumeration type, but
|
||||
* the kernel headers define P_ALL, P_PID and P_PGID as constant macros
|
||||
* instead.
|
||||
*/
|
||||
typedef int idtype_t;
|
||||
|
||||
extern int waidit(idtype_t which, id_t id, siginfo_t *info, int options);
|
||||
|
||||
__END_DECLS
|
||||
|
||||
#endif /* _SYS_WAIT_H_ */
|
||||
|
@ -118,6 +118,9 @@ extern int chdir(const char *);
|
||||
extern int fchdir(int);
|
||||
extern int rmdir(const char *);
|
||||
extern int pipe(int *);
|
||||
#ifdef _GNU_SOURCE /* GLibc compatibility */
|
||||
extern int pipe2(int *, int);
|
||||
#endif
|
||||
extern int chroot(const char *);
|
||||
extern int symlink(const char *, const char *);
|
||||
extern int readlink(const char *, char *, size_t);
|
||||
|
@ -87,4 +87,4 @@ struct utmp* getutent();
|
||||
|
||||
__END_DECLS
|
||||
|
||||
#endif // _UTMP_H_
|
||||
#endif /* _UTMP_H_ */
|
||||
|
25
libc/unistd/eventfd.c
Normal file
25
libc/unistd/eventfd.c
Normal file
@ -0,0 +1,25 @@
|
||||
#include <sys/eventfd.h>
|
||||
#include <unistd.h>
|
||||
|
||||
/* We duplicate the GLibc error semantics, which are poorly defined
|
||||
* if the read() or write() does not return the proper number of bytes.
|
||||
*/
|
||||
int eventfd_read(int fd, eventfd_t *counter)
|
||||
{
|
||||
int ret = read(fd, counter, sizeof(*counter));
|
||||
|
||||
if (ret == sizeof(*counter))
|
||||
return 0;
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
int eventfd_write(int fd, eventfd_t counter)
|
||||
{
|
||||
int ret = write(fd, &counter, sizeof(counter));
|
||||
|
||||
if (ret == sizeof(counter))
|
||||
return 0;
|
||||
|
||||
return -1;
|
||||
}
|
@ -29,6 +29,7 @@
|
||||
#include <stddef.h>
|
||||
|
||||
extern pid_t __wait4 (pid_t pid, int *status, int options, struct rusage *rusage);
|
||||
extern int __waitid(idtype_t which, id_t id, siginfo_t *info, int options, struct rusage *ru);
|
||||
|
||||
pid_t wait( int* status )
|
||||
{
|
||||
@ -44,3 +45,9 @@ pid_t waitpid(pid_t pid, int* status, int options)
|
||||
{
|
||||
return __wait4( pid, status, options, NULL );
|
||||
}
|
||||
|
||||
int waitid(idtype_t which, id_t id, siginfo_t *info, int options)
|
||||
{
|
||||
/* the system call takes an option struct rusage that we don't need */
|
||||
return __waitid(which, id, info, options, NULL);
|
||||
}
|
||||
|
@ -39,6 +39,6 @@ frexpf(float x, int *eptr)
|
||||
}
|
||||
*eptr += (ix>>23)-126;
|
||||
hx = (hx&0x807fffff)|0x3f000000;
|
||||
*(int*)&x = hx;
|
||||
SET_FLOAT_WORD(x,hx);
|
||||
return x;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user