This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "uClibc-ng - small C library for embedded systems". The branch, master has been updated via b38f6240891f78af59e2c5d25361ab67a73e000f (commit) via 7efe10ec5fc772f5328b35ba6716bde815212b45 (commit) from 36043b37739dffdaea8d31457570810e492268d7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b38f6240891f78af59e2c5d25361ab67a73e000f Merge: 36043b3 7efe10e Author: Waldemar Brodkorb &lt;wbx(a)openadk.org&gt; Date: Mon Sep 8 09:10:31 2014 +0200 Merge remote-tracking branch 'origin/upstream' ----------------------------------------------------------------------- Summary of changes: libc/sysdeps/linux/common/Makefile.in | 3 +- libc/sysdeps/linux/common/epoll.c | 40 +++++++++++--------- .../__syscall_error.c => common/epoll_create.c} | 13 ++----- .../{arc/__syscall_error.c => common/epoll_ctl.c} | 13 ++----- .../__syscall_error.c => common/epoll_pwait.c} | 13 ++----- .../{arc/__syscall_error.c => common/epoll_wait.c} | 13 ++----- 6 files changed, 36 insertions(+), 59 deletions(-) copy libc/sysdeps/linux/{arc/__syscall_error.c => common/epoll_create.c} (50%) copy libc/sysdeps/linux/{arc/__syscall_error.c => common/epoll_ctl.c} (50%) copy libc/sysdeps/linux/{arc/__syscall_error.c => common/epoll_pwait.c} (50%) copy libc/sysdeps/linux/{arc/__syscall_error.c => common/epoll_wait.c} (50%) diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in index 13dd77b..dc3a4b7 100644 --- a/libc/sysdeps/linux/common/Makefile.in +++ b/libc/sysdeps/linux/common/Makefile.in @@ -90,7 +90,8 @@ CSRC-$(UCLIBC_HAS_REALTIME) += clock_adjtime.c clock_getres.c clock_gettime.c cl CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise64.c posix_fadvise.c posix_madvise.c \ posix_fallocate.c posix_fallocate64.c CSRC-$(UCLIBC_SUSV4_LEGACY) += utime.c -CSRC-$(UCLIBC_HAS_EPOLL) += epoll.c +CSRC- += epoll.c # multi-source +CSRC-$(UCLIBC_HAS_EPOLL) += epoll_create.c epoll_ctl.c epoll_wait.c epoll_pwait.c CSRC-$(UCLIBC_HAS_XATTR) += xattr.c CSRC-$(UCLIBC_HAS_PROFILING) += noophooks.c #pcprofile.c CSRC-$(UCLIBC_SV4_DEPRECATED) += ustat.c diff --git a/libc/sysdeps/linux/common/epoll.c b/libc/sysdeps/linux/common/epoll.c index 5f1e589..d7b7ca7 100644 --- a/libc/sysdeps/linux/common/epoll.c +++ b/libc/sysdeps/linux/common/epoll.c @@ -11,36 +11,28 @@ #include <sys/epoll.h> #include <cancel.h> -#ifdef __NR_epoll_create +#ifdef L_epoll_create +# ifdef __NR_epoll_create _syscall1(int, epoll_create, int, size) -#endif +# endif -#ifdef __NR_epoll_create1 +# ifdef __NR_epoll_create1 _syscall1(int, epoll_create1, int, flags) -#endif +# endif -#if defined __NR_epoll_create1 && !defined __NR_epoll_create +# if defined __NR_epoll_create1 && !defined __NR_epoll_create int epoll_create(int size) { return INLINE_SYSCALL(epoll_create1, 1, 0); } - +# endif #endif -#ifdef __NR_epoll_ctl +#if defined L_epoll_ctl && defined __NR_epoll_ctl _syscall4(int, epoll_ctl, int, epfd, int, op, int, fd, struct epoll_event *, event) #endif -#ifdef __NR_epoll_wait -static int __NC(epoll_wait)(int epfd, struct epoll_event *events, int maxevents, int timeout) -{ - return INLINE_SYSCALL(epoll_wait, 4, epfd, events, maxevents, timeout); -} -CANCELLABLE_SYSCALL(int, epoll_wait, (int epfd, struct epoll_event *events, int maxevents, int timeout), - (epfd, events, maxevents, timeout)) -#endif - -#ifdef __NR_epoll_pwait +#if defined L_epoll_pwait && defined __NR_epoll_pwait # include <signal.h> # define __NR___syscall_epoll_pwait __NR_epoll_pwait @@ -55,11 +47,23 @@ static int __NC(epoll_pwait)(int epfd, struct epoll_event *events, int maxevents CANCELLABLE_SYSCALL(int, epoll_pwait, (int epfd, struct epoll_event *events, int maxevents, int timeout, const sigset_t *set), (epfd, events, maxevents, timeout, set)) +#endif + +#if defined L_epoll_wait +# if defined __NR_epoll_wait +static int __NC(epoll_wait)(int epfd, struct epoll_event *events, int maxevents, int timeout) +{ + return INLINE_SYSCALL(epoll_wait, 4, epfd, events, maxevents, timeout); +} +CANCELLABLE_SYSCALL(int, epoll_wait, (int epfd, struct epoll_event *events, int maxevents, int timeout), + (epfd, events, maxevents, timeout)) + + +# elif /* !defined L_epoll_wait && */ defined __NR_epoll_pwait /* * If epoll_wait is not defined, then call epoll_pwait instead using NULL * for sigmask argument */ -# ifndef __NR_epoll_wait # include <stddef.h> int epoll_wait(int epfd, struct epoll_event *events, int maxevents, int timeout) { diff --git a/libc/sysdeps/linux/arc/__syscall_error.c b/libc/sysdeps/linux/common/epoll_create.c similarity index 50% copy from libc/sysdeps/linux/arc/__syscall_error.c copy to libc/sysdeps/linux/common/epoll_create.c index 962d743..80896f6 100644 --- a/libc/sysdeps/linux/arc/__syscall_error.c +++ b/libc/sysdeps/linux/common/epoll_create.c @@ -1,15 +1,8 @@ -/* Wrapper for setting errno. - * +/* * Copyright (C) 2000-2006 Erik Andersen &lt;andersen(a)uclibc.org&gt; * * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB in this tarball. */ -#include <errno.h> -#include <sys/syscall.h> - -int __syscall_error(int err_no) -{ - __set_errno(-err_no); - return -1; -} +#define L_epoll_create +#include "epoll.c" diff --git a/libc/sysdeps/linux/arc/__syscall_error.c b/libc/sysdeps/linux/common/epoll_ctl.c similarity index 50% copy from libc/sysdeps/linux/arc/__syscall_error.c copy to libc/sysdeps/linux/common/epoll_ctl.c index 962d743..53868cc 100644 --- a/libc/sysdeps/linux/arc/__syscall_error.c +++ b/libc/sysdeps/linux/common/epoll_ctl.c @@ -1,15 +1,8 @@ -/* Wrapper for setting errno. - * +/* * Copyright (C) 2000-2006 Erik Andersen &lt;andersen(a)uclibc.org&gt; * * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB in this tarball. */ -#include <errno.h> -#include <sys/syscall.h> - -int __syscall_error(int err_no) -{ - __set_errno(-err_no); - return -1; -} +#define L_epoll_ctl +#include "epoll.c" diff --git a/libc/sysdeps/linux/arc/__syscall_error.c b/libc/sysdeps/linux/common/epoll_pwait.c similarity index 50% copy from libc/sysdeps/linux/arc/__syscall_error.c copy to libc/sysdeps/linux/common/epoll_pwait.c index 962d743..07461f9 100644 --- a/libc/sysdeps/linux/arc/__syscall_error.c +++ b/libc/sysdeps/linux/common/epoll_pwait.c @@ -1,15 +1,8 @@ -/* Wrapper for setting errno. - * +/* * Copyright (C) 2000-2006 Erik Andersen &lt;andersen(a)uclibc.org&gt; * * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB in this tarball. */ -#include <errno.h> -#include <sys/syscall.h> - -int __syscall_error(int err_no) -{ - __set_errno(-err_no); - return -1; -} +#define L_epoll_pwait +#include "epoll.c" diff --git a/libc/sysdeps/linux/arc/__syscall_error.c b/libc/sysdeps/linux/common/epoll_wait.c similarity index 50% copy from libc/sysdeps/linux/arc/__syscall_error.c copy to libc/sysdeps/linux/common/epoll_wait.c index 962d743..6963447 100644 --- a/libc/sysdeps/linux/arc/__syscall_error.c +++ b/libc/sysdeps/linux/common/epoll_wait.c @@ -1,15 +1,8 @@ -/* Wrapper for setting errno. - * +/* * Copyright (C) 2000-2006 Erik Andersen &lt;andersen(a)uclibc.org&gt; * * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB in this tarball. */ -#include <errno.h> -#include <sys/syscall.h> - -int __syscall_error(int err_no) -{ - __set_errno(-err_no); - return -1; -} +#define L_epoll_wait +#include "epoll.c" hooks/post-receive -- uClibc-ng - small C library for embedded systems