[3/5] linux: Consolidate sync_file_range implementation

Message ID 1495563960-669-4-git-send-email-adhemerval.zanella@linaro.org
State New
Headers show
Series
  • Remove sysdep-cancel assembly macro
Related show

Commit Message

Adhemerval Zanella May 23, 2017, 6:25 p.m.
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.
---
 ChangeLog                                         | 6 ++++++
 io/Makefile                                       | 1 -
 sysdeps/unix/sysv/linux/Makefile                  | 1 +
 sysdeps/unix/sysv/linux/wordsize-64/syscalls.list | 1 -
 4 files changed, 7 insertions(+), 2 deletions(-)

-- 
2.7.4

Comments

Adhemerval Zanella June 15, 2017, 6:46 p.m. | #1
On 23/05/2017 15:25, Adhemerval Zanella wrote:
> 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.


This patch is straightforward and follow the other consolidation I have
done.  I will push this soon.

> ---

>  ChangeLog                                         | 6 ++++++

>  io/Makefile                                       | 1 -

>  sysdeps/unix/sysv/linux/Makefile                  | 1 +

>  sysdeps/unix/sysv/linux/wordsize-64/syscalls.list | 1 -

>  4 files changed, 7 insertions(+), 2 deletions(-)

> 

> diff --git a/io/Makefile b/io/Makefile

> index 16365e5..2f26bf5 100644

> --- 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 99b3f9d..1a170c2 100644

> --- 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 5c78677..4bb7ebf 100644

> --- 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

>

Patch

diff --git a/io/Makefile b/io/Makefile
index 16365e5..2f26bf5 100644
--- 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 99b3f9d..1a170c2 100644
--- 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 5c78677..4bb7ebf 100644
--- 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