GNU C Library master sources branch master updated. glibc-2.25-253-g085e07d

[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  085e07db22e5bb6c898cd686c0ae3e7cd4ab17f2 (commit)
      from  0516e24d1882ee7f1946b53bec360b400548cb4f (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=085e07db22e5bb6c898cd686c0ae3e7cd4ab17f2

commit 085e07db22e5bb6c898cd686c0ae3e7cd4ab17f2
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Fri Apr 28 16:52:16 2017 +0000

    conformtest: Allow time.h inclusion from semaphore.h for XOPEN2K.
    
    POSIX.1:2001 added sem_timedwait, but said nothing about defining
    struct timespec in semaphore.h.  The 2008 edition added a
    corresponding permission to include <time.h> from <semaphore.h>.
    Since this is the normal POSIX approach in such cases, it seems
    appropriate to consider this a bug fix, and so this patch makes the
    conform/ tests allow that inclusion for POSIX.1:2001 as well.
    
    Tested for x86_64.
    
    	* conform/data/semaphore.h-data [XOPEN2K] (time.h): Allow header
    	inclusion.
    	* conform/Makefile (test-xfail-XOPEN2K/semaphore.h/conform):
    	Remove.

diff --git a/ChangeLog b/ChangeLog
index 9ba5a94..5bb80d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-04-28  Joseph Myers  <joseph@codesourcery.com>
+
+	* conform/data/semaphore.h-data [XOPEN2K] (time.h): Allow header
+	inclusion.
+	* conform/Makefile (test-xfail-XOPEN2K/semaphore.h/conform):
+	Remove.
+
 2017-04-27  Joseph Myers  <joseph@codesourcery.com>
 
 	* conform/GlibcConform.pm (XPG4): Rename standard to XPG42.
diff --git a/conform/Makefile b/conform/Makefile
index 1f38b30..2039ae8 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -176,7 +176,6 @@ test-xfail-UNIX98/netinet/in.h/conform = yes
 test-xfail-UNIX98/signal.h/conform = yes
 test-xfail-UNIX98/sys/wait.h/conform = yes
 test-xfail-UNIX98/ucontext.h/conform = yes
-test-xfail-XOPEN2K/semaphore.h/conform = yes
 test-xfail-XOPEN2K/signal.h/conform = yes
 test-xfail-XOPEN2K/sys/wait.h/conform = yes
 test-xfail-XOPEN2K/ucontext.h/conform = yes
diff --git a/conform/data/semaphore.h-data b/conform/data/semaphore.h-data
index 7c26cd3..066c2f7 100644
--- a/conform/data/semaphore.h-data
+++ b/conform/data/semaphore.h-data
@@ -20,7 +20,9 @@ allow-header fcntl.h
 # if !defined POSIX2008 && !defined XOPEN2K8
 allow-header sys/types.h
 # endif
-# if !defined POSIX && !defined UNIX98 && !defined XOPEN2K
+// Consider addition of this permission in POSIX.1:2008 as a bug fix,
+// so allow for POSIX.1:2001 as well since that includes sem_timedwait.
+# if !defined POSIX && !defined UNIX98
 allow-header time.h
 # endif
 

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

Summary of changes:
 ChangeLog                     |    7 +++++++
 conform/Makefile              |    1 -
 conform/data/semaphore.h-data |    4 +++-
 3 files changed, 10 insertions(+), 2 deletions(-)


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