GNU C Library master sources branch master updated. glibc-2.22-452-gc2c904f

[azanella at sourceware dot org]

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 "GNU C Library master sources".

The branch, master has been updated
       via  c2c904ffd3bef6270746cacde403c29dbfa60a4d (commit)
      from  751709fec943a853c2543eb6f7995cae723f7b78 (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 -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c2c904ffd3bef6270746cacde403c29dbfa60a4d

commit c2c904ffd3bef6270746cacde403c29dbfa60a4d
Author: Adhemerval Zanella <adhemerval.zanella@linaro.com>
Date:   Mon Oct 19 18:14:39 2015 -0200

    Cleanup sync_file_range implementation
    
    Since GLIBC requires a minimum 2.6.32 kernel, the patch cleanups
    the mips code to assume __NR_sync_file_range and the powerpc one
    to either assume __NR_sync_file_range2 or __NR_sync_file_range.
    
    Checked on powerpc64le and build for mips (ABIO32, ABIN32, and ABI64).
    
    	* sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c
    	(__NR_sync_file_range2): Assume it is always defined.
    	* sysdeps/unix/sysv/linux/mips/mips32/sync_file_range.c
    	(__NR_sync_file_range): Assume it is always defined.

diff --git a/ChangeLog b/ChangeLog
index 6160f17..b4bb023 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-10-22  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c
+	(__NR_sync_file_range2): Assume it is always defined.
+	* sysdeps/unix/sysv/linux/mips/mips32/sync_file_range.c
+	(__NR_sync_file_range): Assume it is always defined.
+
 2015-10-22  Andreas Schwab  <schwab@suse.de>
 
 	* sysdeps/unix/sysv/linux/i386/fxstat.c (__fxstat): Use
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/sync_file_range.c b/sysdeps/unix/sysv/linux/mips/mips32/sync_file_range.c
index b79e44d..0d85168 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/sync_file_range.c
+++ b/sysdeps/unix/sysv/linux/mips/mips32/sync_file_range.c
@@ -23,8 +23,6 @@
 #include <sysdep-cancel.h>
 #include <sys/syscall.h>
 
-
-#ifdef __NR_sync_file_range
 int
 sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags)
 {
@@ -33,12 +31,3 @@ sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags)
 			 __LONG_LONG_PAIR ((long) (to >> 32), (long) to),
 			 flags);
 }
-#else
-int
-sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags)
-{
-  __set_errno (ENOSYS);
-  return -1;
-}
-stub_warning (sync_file_range)
-#endif
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c
index 9f46458..92245f9 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c
@@ -23,19 +23,8 @@
 #include <sysdep-cancel.h>
 #include <sys/syscall.h>
 
-
-#if defined __NR_sync_file_range2
 int
 sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags)
 {
   return SYSCALL_CANCEL (sync_file_range2, fd, flags, from, to);
 }
-#else
-int
-sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags)
-{
-  __set_errno (ENOSYS);
-  return -1;
-}
-stub_warning (sync_file_range)
-#endif

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                          |    7 +++++++
 .../unix/sysv/linux/mips/mips32/sync_file_range.c  |   11 -----------
 .../sysv/linux/powerpc/powerpc64/sync_file_range.c |   11 -----------
 3 files changed, 7 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources