diff --git a/ChangeLog b/ChangeLog index bc92bfc73d..0ce006319a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2017-05-18 Adhemerval Zanella + * sysdeps/unix/sysv/linux/Makefile (sysdep_routines): Add splice. + (CFLAGS-splice.c): New flag. + * sysdeps/unix/sysv/linux/splice.c: New file. + * sysdeps/unix/sysv/linux/syscalls.list (splice): Remove from + auto-generation syscall list. + * misc/Makefile (CFLAGS-splice.c): New rule. + * sysdeps/unix/sysv/linux/Makefile (CFLAGS-vmsplice.c): New flag. * sysdeps/unix/sysv/linux/syscalls.list (vmsplice): Remove from auto-generation syscall list. diff --git a/misc/Makefile b/misc/Makefile index c4a75b5908..e4fe468467 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -112,6 +112,7 @@ CFLAGS-msync.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-fdatasync.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-fsync.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-vmsplice.c = -fexceptions -fasynchronous-unwind-tables +CFLAGS-splice.c = -fexceptions -fasynchronous-unwind-tables # Called during static library initialization, so turn stack-protection # off for non-shared builds. diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 7d1f3d3197..c1f6e24775 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -17,7 +17,7 @@ include $(firstword $(wildcard $(sysdirs:=/sysctl.mk))) sysdep_routines += clone umount umount2 readahead \ setfsuid setfsgid epoll_pwait signalfd \ eventfd eventfd_read eventfd_write prlimit \ - personality epoll_wait tee vmsplice + personality epoll_wait tee vmsplice splice CFLAGS-gethostid.c = -fexceptions CFLAGS-tee.c = -fexceptions -fasynchronous-unwind-tables diff --git a/sysdeps/unix/sysv/linux/splice.c b/sysdeps/unix/sysv/linux/splice.c new file mode 100644 index 0000000000..2aaf878c60 --- /dev/null +++ b/sysdeps/unix/sysv/linux/splice.c @@ -0,0 +1,27 @@ +/* Splice data to/from a pipe Linux implementation. + Copyright (C) 2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include + +ssize_t +splice (int fd_in, loff_t *off_in, int fd_out, loff_t *off_out, size_t len, + unsigned int flags) +{ + return SYSCALL_CANCEL (splice, fd_in, off_in, fd_out, off_out, len, flags); +} diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list index 9d7bd658af..b40825afbd 100644 --- a/sysdeps/unix/sysv/linux/syscalls.list +++ b/sysdeps/unix/sysv/linux/syscalls.list @@ -64,7 +64,6 @@ setfsgid EXTRA setfsgid i:i setfsgid setfsuid EXTRA setfsuid i:i setfsuid setpgid - setpgid i:ii __setpgid setpgid sigaltstack - sigaltstack i:PP __sigaltstack sigaltstack -splice EXTRA splice Ci:iPiPii splice stime - stime i:p stime sysinfo EXTRA sysinfo i:p __sysinfo sysinfo swapon - swapon i:si __swapon swapon