GNU C Library master sources branch master updated. glibc-2.25-487-g48d966e

[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  48d966eb359b559f292b7f6896eff7746e5af390 (commit)
       via  244361ebaec57a6fbb9998bfa5ec71ee8d88f3e8 (commit)
      from  70fe2eb79417166c39a36699f591138bfe5c5307 (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=48d966eb359b559f292b7f6896eff7746e5af390

commit 48d966eb359b559f292b7f6896eff7746e5af390
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date:   Fri May 19 10:33:58 2017 -0300

    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 8fb6aaa..3255a1f 100644
--- 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 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

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=244361ebaec57a6fbb9998bfa5ec71ee8d88f3e8

commit 244361ebaec57a6fbb9998bfa5ec71ee8d88f3e8
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date:   Wed May 24 09:17:34 2017 -0300

    support: Add optstring support
    
    This patch adds an option to test to add small command line option
    through CMDLINE_OPTSTRING define.  For instance:
    
      #define CMDLINE_OPTSTRING "vd"
    
      static void
      cmdline_process_function (int c)
      {
        switch (c):
          'v':
            /* process '-v' option.  */
          break;
          'd':
            /* process '-d' option.  */
          break;
      }
      #define CMDLINE_PROCESS cmdline_process_function
    
    It will add both '-v' and '-d' along with already default long options.
    
    	* 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.
    	(CMDLINE_OPTSTRING): New define.
    	* support/test-driver.h (test_config): Add optstring member.

diff --git a/ChangeLog b/ChangeLog
index 70faa63..8fb6aaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2017-06-15  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+
+	 * 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.
+	 (CMDLINE_OPTSTRING): New define.
+	 * support/test-driver.h (test_config): Add optstring member.
+
 2017-06-15  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/x86_64/multiarch/Makefile (sysdep_routines): Add
diff --git a/support/support_test_main.c b/support/support_test_main.c
index 914d64f..3c411a4 100644
--- a/support/support_test_main.c
+++ b/support/support_test_main.c
@@ -211,7 +211,8 @@ support_test_main (int argc, char **argv, const struct test_config *config)
         mallopt (M_PERTURB, 42);
     }
 
-  while ((opt = getopt_long (argc, argv, "+", options, NULL)) != -1)
+  while ((opt = getopt_long (argc, argv, config->optstring, options, NULL))
+	 != -1)
     switch (opt)
       {
       case '?':
diff --git a/support/test-driver.c b/support/test-driver.c
index 482066d..47c387c 100644
--- a/support/test-driver.c
+++ b/support/test-driver.c
@@ -93,6 +93,10 @@
    has this type:
 
      void CMDLINE_PROCESS (int);
+
+   If the program also to process custom default short command line
+   argument (similar to getopt) it must define CMDLINE_OPTSTRING
+   with the expected options (for instance "vb").
 */
 
 #include <support/test-driver.h>
@@ -151,6 +155,11 @@ main (int argc, char **argv)
 #ifdef CMDLINE_PROCESS
   test_config.cmdline_function = CMDLINE_PROCESS;
 #endif
+#ifdef CMDLINE_OPTSTRING
+  test_config.optstring = "+" CMDLINE_OPTSTRING;
+#else
+  test_config.optstring = "+";
+#endif
 
   return support_test_main (argc, argv, &test_config);
 }
diff --git a/support/test-driver.h b/support/test-driver.h
index af1971a..a8fe9c3 100644
--- a/support/test-driver.h
+++ b/support/test-driver.h
@@ -35,6 +35,7 @@ struct test_config
   int expected_status;   /* Expected exit status.  */
   int expected_signal;   /* If non-zero, expect termination by signal.  */
   char no_mallopt;       /* Boolean flag to disable mallopt.  */
+  const char *optstring; /* Short command line options.  */
 };
 
 enum

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

Summary of changes:
 ChangeLog                                         |   14 ++++++++++++++
 io/Makefile                                       |    1 -
 support/support_test_main.c                       |    3 ++-
 support/test-driver.c                             |    9 +++++++++
 support/test-driver.h                             |    1 +
 sysdeps/unix/sysv/linux/Makefile                  |    1 +
 sysdeps/unix/sysv/linux/wordsize-64/syscalls.list |    1 -
 7 files changed, 27 insertions(+), 3 deletions(-)


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