linux: Consolidate sync_file_range implementation

This patch consolidates Linux sync_file_range at default
sysdeps/unix/sysv/linux/sync_file_range.c implementation.  It also
moves the rules flags from generic io/Makefile to Linux one due the
fact it is a Linux-only symbol.

Checked on i686-linux-gnu and x86_64-linux-gnu.

	* io/Makefile (CFLAGS-sync_file_range.c): Remove rule.
	* sysdeps/unix/sysv/linux/Makefile (CFLAGS-sync_file_range.c): New
	rule.
	* sysdeps/unix/sysv/linux/wordsize-64/syscalls.list: Remove
	sync_file_range.

diff --git a/ChangeLog b/ChangeLog
index 8fb6aaae0c331864aa2bd9baac6f899c92c9b437..3255a1fdf239c494fa888da95b7837e0c123eaa8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2017-06-15  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
+       * io/Makefile (CFLAGS-sync_file_range.c): Remove rule.
+       * sysdeps/unix/sysv/linux/Makefile (CFLAGS-sync_file_range.c): New
+       rule.
+       * sysdeps/unix/sysv/linux/wordsize-64/syscalls.list: Remove
+       sync_file_range.
+
         * support/support_test_main.c (support_test_main):  Use optstring
         member for option string in getopt_long.
         * support/test-driver.c: Add comment about CMDLINE_OPTSTRING.

diff --git a/io/Makefile b/io/Makefile
index 16365e581a033d6a0b9a43f06e3edd53b728c740..2f26bf56dbc63d04a8046fc9d6ee530064cccf77 100644 (file)
--- a/io/Makefile
+++ b/io/Makefile
@@ -99,7 +99,6 @@ CFLAGS-posix_fallocate.c = -fexceptions
 CFLAGS-posix_fallocate64.c = -fexceptions
 CFLAGS-fallocate.c = -fexceptions
 CFLAGS-fallocate64.c = -fexceptions
-CFLAGS-sync_file_range.c = -fexceptions
 CFLAGS-read.c = -fexceptions
 CFLAGS-write.c = -fexceptions
 

diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 99b3f9d3466b27e0e775061a37e498d4c11d15ed..1a170c29d65c3a35bd914abc0b35f44d3adc88ca 100644 (file)
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -25,6 +25,7 @@ CFLAGS-tee.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-vmsplice.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-splice.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-open_by_handle_at.c = -fexceptions -fasynchronous-unwind-tables
+CFLAGS-sync_file_range.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-tst-writev.c += "-DARTIFICIAL_LIMIT=(0x80000000-sysconf(_SC_PAGESIZE))"
 
 # Note that bits/mman-linux.h is listed here though the file lives in the

diff --git a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
index 5c78677d77fe5bebb026999553306b3d633e7901..4bb7ebfacb05f29fee3ca31cb56bc294e90c32a8 100644 (file)
--- a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
@@ -4,7 +4,6 @@ fstatfs         -       fstatfs         i:ip    __fstatfs       fstatfs fstatfs64 __fstatfs64
 statfs         -       statfs          i:sp    __statfs        statfs statfs64
 readahead      -       readahead       i:iii   __readahead     readahead
 sendfile       -       sendfile        i:iipi  sendfile        sendfile64
-sync_file_range        -       sync_file_range Ci:iiii sync_file_range
 prlimit                EXTRA   prlimit64       i:iipp  prlimit         prlimit64
 
 fanotify_mark  EXTRA   fanotify_mark   i:iiiis fanotify_mark