GNU C Library master sources branch master updated. glibc-2.23-306-g77d21a1

[jsm28 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  77d21a1f4f56659dc3f6d0e841cdf8df0ba2a16a (commit)
      from  46c1ffa4d50ec6a11fb845708a94f107fdb765d2 (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=77d21a1f4f56659dc3f6d0e841cdf8df0ba2a16a

commit 77d21a1f4f56659dc3f6d0e841cdf8df0ba2a16a
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Tue May 10 15:20:09 2016 +0000

    conformtest: Fix st_blksize, st_blocks expectations for XPG3, XPG4.
    
    The conformtest expectations expect the struct stat fields st_blksize
    and st_blocks to be of types blksize_t and blkcnt_t.  But XPG4 does
    not have those types, using long instead, and XPG3 does not have these
    fields at all.  This patch adjusts the expectations for those
    standards, XFAILing them for XPG4 to allow for systems where the
    typedefs don't correspond to long.
    
    Tested for x86_64 and x86.
    
    	* conform/data/sys/stat.h-data (st_blksize): Do not expect for
    	[XPG3].  Expect type long and XFAIL for [XPG4].
    	(st_blocks): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 93db66f..4e0870f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2016-05-10  Joseph Myers  <joseph@codesourcery.com>
 
+	* conform/data/sys/stat.h-data (st_blksize): Do not expect for
+	[XPG3].  Expect type long and XFAIL for [XPG4].
+	(st_blocks): Likewise.
+
 	[BZ #20044]
 	* posix/unistd.h [__USE_UNIX98 && !__USE_XOPEN2K]
 	(pthread_atfork): New prototype.
diff --git a/conform/data/sys/stat.h-data b/conform/data/sys/stat.h-data
index f5b17a3..c70ef45 100644
--- a/conform/data/sys/stat.h-data
+++ b/conform/data/sys/stat.h-data
@@ -44,9 +44,17 @@ element {struct stat} {struct timespec} st_atim
 element {struct stat} {struct timespec} st_mtim
 element {struct stat} {struct timespec} st_ctim
 #endif
-#if !defined POSIX && !defined POSIX2008
+#if !defined XPG3 && !defined POSIX && !defined POSIX2008
+# ifdef XPG4
+// The XPG4 use of "long" for these fields is not compatible with the
+// use of typedefs in future standards to support values outside the
+// range of "long".
+xfail-element {struct stat} long st_blksize
+xfail-element {struct stat} long st_blocks
+# else
 element {struct stat} blksize_t st_blksize
 element {struct stat} blkcnt_t st_blocks
+# endif
 #endif
 
 # if defined XOPEN2K8 || defined POSIX2008

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

Summary of changes:
 ChangeLog                    |    4 ++++
 conform/data/sys/stat.h-data |   10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletions(-)


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