From 8c7686294ebecda8d3801e0a38ba174c9b527f8f Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Wed, 5 Nov 2014 09:52:42 +0000 Subject: [PATCH] Fix gnu11 fallout on Solaris 10+ libobjc: * thr.c (_XOPEN_SOURCE): Define as 600. libiberty: * sigsetmask.c (_POSIX_SOURCE): Remove. libgomp: * config/posix/lock.c (_XOPEN_SOURCE) Define as 600. From-SVN: r217117 --- libgomp/ChangeLog | 4 ++++ libgomp/config/posix/lock.c | 5 +++-- libiberty/ChangeLog | 4 ++++ libiberty/sigsetmask.c | 1 - libobjc/ChangeLog | 4 ++++ libobjc/thr.c | 5 +++-- 6 files changed, 18 insertions(+), 5 deletions(-) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 661653e1ac8..b004551ecad 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,7 @@ +2014-11-05 Rainer Orth + + * config/posix/lock.c (_XOPEN_SOURCE) Define as 600. + 2014-10-06 Marek Polacek * testsuite/libgomp.c/affinity-1.c: Include . diff --git a/libgomp/config/posix/lock.c b/libgomp/config/posix/lock.c index e1e38f4c6a8..c65e041863d 100644 --- a/libgomp/config/posix/lock.c +++ b/libgomp/config/posix/lock.c @@ -30,8 +30,9 @@ to do better and streamline the locking as well as reduce the size of the types exported. */ -/* We need Unix98 extensions to get recursive locks. */ -#define _XOPEN_SOURCE 500 +/* We need UNIX98/XPG5 extensions to get recursive locks. Request XPG6 since + Solaris requires this for C99 and later. */ +#define _XOPEN_SOURCE 600 #include "libgomp.h" diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index d30a80b22ab..ff06b184aaa 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +2014-11-05 Rainer Orth + + * sigsetmask.c (_POSIX_SOURCE): Remove. + 2014-10-28 Yury Gribov * strtoll.c: New file. diff --git a/libiberty/sigsetmask.c b/libiberty/sigsetmask.c index 3b708b16adb..f7a24246d1f 100644 --- a/libiberty/sigsetmask.c +++ b/libiberty/sigsetmask.c @@ -15,7 +15,6 @@ be the value @code{1}). */ -#define _POSIX_SOURCE #include /* Including seems to be needed by ISC. */ #include diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 6559fcce24c..1d0814dd318 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,7 @@ +2014-11-05 Rainer Orth + + * thr.c (_XOPEN_SOURCE): Define as 600. + 2014-07-27 Alan Modra Matthias Klose diff --git a/libobjc/thr.c b/libobjc/thr.c index 27c7fe6bdb4..988c0ff1841 100644 --- a/libobjc/thr.c +++ b/libobjc/thr.c @@ -27,8 +27,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #define _LIBOBJC /* The line below is needed for declarations of functions such as pthread_mutexattr_settype, without which gthr-posix.h may fail to - compile within libobjc. */ -#define _XOPEN_SOURCE 500 + compile within libobjc. While we only need XPG5 for this, Solaris + requires XPG6 for C99 and later. */ +#define _XOPEN_SOURCE 600 #include "config.h" #include "tconfig.h" #include "coretypes.h" -- 2.30.2