From fdbb0d98bae4c3f62e5893b9194456cae61bd1d2 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Mon, 2 Nov 2015 12:14:35 -0200 Subject: posix: Consolidate Linux fsync syscall This patch consolidates the fsync Linux syscall generation on sysdeps/unix/sysv/linux/fsync.c. It basically removes it from architectures auto-generation list. For arm it also removes the __errno_location call since fsync is not called with SYSCALL_CANCEL with call arch-specific INLINE_SYSCALL macro which in turn will call __set_errno macro (and setting errno directly). Checked on i686-linux-gnu, x86_64-linux-gnu, x86_64-linux-gnux32, arch64-linux-gnu, arm-linux-gnueabihf, powerpc64le-linux-gnu, sparc64-linux-gnu, and sparcv9-linux-gnu. * misc/Makefile (CFLAGS-fsync.c): New flag. * nptl/Makefile (CFLAGS-fsync.c): Likewise. * sysdeps/unix/syscalls.list (fsync): Remove from auto-generation syscall list. * sysdeps/unix/sysv/linux/fsync.c: New file. * sysdeps/unix/sysv/linux/arm/localplt.data [libpthread.so] (__errno_location): Remove. --- ChangeLog | 8 ++++++++ misc/Makefile | 1 + nptl/Makefile | 1 + sysdeps/unix/syscalls.list | 1 - sysdeps/unix/sysv/linux/arm/localplt.data | 1 - sysdeps/unix/sysv/linux/fsync.c | 28 ++++++++++++++++++++++++++++ 6 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/fsync.c diff --git a/ChangeLog b/ChangeLog index 6e88eeffea..b04b779ef7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2017-05-18 Adhemerval Zanella + * misc/Makefile (CFLAGS-fsync.c): New flag. + * nptl/Makefile (CFLAGS-fsync.c): Likewise. + * sysdeps/unix/syscalls.list (fsync): Remove from auto-generation + syscall list. + * sysdeps/unix/sysv/linux/fsync.c: New file. + * sysdeps/unix/sysv/linux/arm/localplt.data [libpthread.so] + (__errno_location): Remove. + * misc/Makefile (CFLAGS-fdatasync.c): New rule. * nptl/Makefile (CFLAGS-fdatasync.c): Likewise. * sysdeps/unix/syscalls.list: Remove fdatasync from auto-generation diff --git a/misc/Makefile b/misc/Makefile index a777ece4a5..2db1fd8397 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -110,6 +110,7 @@ CFLAGS-err.c = -fexceptions CFLAGS-tst-tsearch.c = $(stack-align-test-flags) CFLAGS-msync.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-fdatasync.c = -fexceptions -fasynchronous-unwind-tables +CFLAGS-fsync.c = -fexceptions -fasynchronous-unwind-tables # Called during static library initialization, so turn stack-protection # off for non-shared builds. diff --git a/nptl/Makefile b/nptl/Makefile index 90eac7c7f2..eeadf4c425 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -220,6 +220,7 @@ CFLAGS-nanosleep.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-sigsuspend.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-msync.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-fdatasync.c = -fexceptions -fasynchronous-unwind-tables +CFLAGS-fsync.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-pt-system.c = -fexceptions diff --git a/sysdeps/unix/syscalls.list b/sysdeps/unix/syscalls.list index c4135d8851..61e5360b4d 100644 --- a/sysdeps/unix/syscalls.list +++ b/sysdeps/unix/syscalls.list @@ -19,7 +19,6 @@ fchmod - fchmod i:ii __fchmod fchmod fchown - fchown i:iii __fchown fchown fcntl - fcntl Ci:iiF __libc_fcntl __fcntl fcntl fstatfs - fstatfs i:ip __fstatfs fstatfs -fsync - fsync Ci:i __libc_fsync fsync ftruncate - ftruncate i:ii __ftruncate ftruncate getdomain - getdomainname i:si getdomainname getgid - getgid Ei: __getgid getgid diff --git a/sysdeps/unix/sysv/linux/arm/localplt.data b/sysdeps/unix/sysv/linux/arm/localplt.data index 8bc876dd03..19d3299d98 100644 --- a/sysdeps/unix/sysv/linux/arm/localplt.data +++ b/sysdeps/unix/sysv/linux/arm/localplt.data @@ -5,7 +5,6 @@ libc.so: memalign libc.so: raise libc.so: realloc libm.so: matherr -libpthread.so: __errno_location libpthread.so: raise # The dynamic loader needs __tls_get_addr for TLS. ld.so: __tls_get_addr diff --git a/sysdeps/unix/sysv/linux/fsync.c b/sysdeps/unix/sysv/linux/fsync.c new file mode 100644 index 0000000000..ac4827bd5e --- /dev/null +++ b/sysdeps/unix/sysv/linux/fsync.c @@ -0,0 +1,28 @@ +/* Synchronize a file's in-core state with storage device 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 + +/* Make all changes done to FD actually appear on disk. */ +int +fsync (int fd) +{ + return SYSCALL_CANCEL (fsync, fd); +} -- cgit 1.4.1