From 7ec669539f63d02defeba9cb60f9ada265e9c64a Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 18 Jul 2011 23:08:09 +0000 Subject: [PATCH] * sysconf.cc (sca): Return -1 for _SC_THREAD_ROBUST_PRIO_INHERIT, _SC_THREAD_ROBUST_PRIO_PROTECT, and _SC_XOPEN_UUCP. (SC_MAX): Redefine accordingly. (csa): Return strings for _CS_POSIX_V7_THREADS_CFLAGS, _CS_POSIX_V7_THREADS_LDFLAGS, and _CS_V7_ENV. (CS_MAX): Redefine accordingly. * include/limits.h (LONG_BIT): Define. (WORD_BIT): Define. --- winsup/cygwin/ChangeLog | 11 +++++++++++ winsup/cygwin/include/limits.h | 8 ++++++++ winsup/cygwin/sysconf.cc | 12 +++++++++--- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 87f1f59d9..7419f47b0 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,14 @@ +2011-07-18 Yaakov Selkowitz + + * sysconf.cc (sca): Return -1 for _SC_THREAD_ROBUST_PRIO_INHERIT, + _SC_THREAD_ROBUST_PRIO_PROTECT, and _SC_XOPEN_UUCP. + (SC_MAX): Redefine accordingly. + (csa): Return strings for _CS_POSIX_V7_THREADS_CFLAGS, + _CS_POSIX_V7_THREADS_LDFLAGS, and _CS_V7_ENV. + (CS_MAX): Redefine accordingly. + * include/limits.h (LONG_BIT): Define. + (WORD_BIT): Define. + 2011-07-18 Corinna Vinschen * heap.cc (heap_init): Change type of largest_found to PVOID. Start diff --git a/winsup/cygwin/include/limits.h b/winsup/cygwin/include/limits.h index f3bdece68..61d6ae542 100644 --- a/winsup/cygwin/include/limits.h +++ b/winsup/cygwin/include/limits.h @@ -26,6 +26,14 @@ details. */ #undef CHAR_BIT #define CHAR_BIT 8 +/* Number of bits in a `long'. */ +#undef LONG_BIT +#define LONG_BIT 32 + +/* Number of bits in a `int'. */ +#undef WORD_BIT +#define WORD_BIT 32 + /* Maximum length of a multibyte character. */ #ifndef MB_LEN_MAX /* TODO: This is newlib's max value. We should probably rather define our diff --git a/winsup/cygwin/sysconf.cc b/winsup/cygwin/sysconf.cc index 351946249..cdb86ab75 100644 --- a/winsup/cygwin/sysconf.cc +++ b/winsup/cygwin/sysconf.cc @@ -219,10 +219,13 @@ static struct {cons, {c:_POSIX2_SW_DEV}}, /* 119, _SC_2_SW_DEV */ {cons, {c:_POSIX2_UPE}}, /* 120, _SC_2_UPE */ {cons, {c:_POSIX2_VERSION}}, /* 121, _SC_2_VERSION */ + {cons, {c:-1L}}, /* 122, _SC_THREAD_ROBUST_PRIO_INHERIT */ + {cons, {c:-1L}}, /* 123, _SC_THREAD_ROBUST_PRIO_PROTECT */ + {cons, {c:-1L}}, /* 124, _SC_XOPEN_UUCP */ }; #define SC_MIN _SC_ARG_MAX -#define SC_MAX _SC_2_VERSION +#define SC_MAX _SC_XOPEN_UUCP /* sysconf: POSIX 4.8.1.1 */ /* Allows a portable app to determine quantities of resources or @@ -259,7 +262,7 @@ static struct {0, NULL}, /* _CS_POSIX_V6_ILP32_OFF32_CFLAGS */ {0, NULL}, /* _CS_POSIX_V6_ILP32_OFF32_LDFLAGS */ {0, NULL}, /* _CS_POSIX_V6_ILP32_OFF32_LIBS */ - {0, NULL}, /* _CS_POSIX_V6_ILP32_OFF32_LINTFLAGS */ + {0, NULL}, /* _CS_XBS5_ILP32_OFF32_LINTFLAGS */ {ls ("")}, /* _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS */ {ls ("")}, /* _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS */ {ls ("")}, /* _CS_POSIX_V6_ILP32_OFFBIG_LIBS */ @@ -273,10 +276,13 @@ static struct {0, NULL}, /* _CS_POSIX_V6_LPBIG_OFFBIG_LIBS */ {0, NULL}, /* _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS */ {ls ("POSIX_V6_ILP32_OFFBIG")}, /* _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS */ + {ls ("")}, /* _CS_POSIX_V7_THREADS_CFLAGS */ + {ls ("")}, /* _CS_POSIX_V7_THREADS_LDFLAGS */ + {ls ("POSIXLY_CORRECT=1")}, /* _CS_V7_ENV */ }; #define CS_MIN _CS_PATH -#define CS_MAX _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS +#define CS_MAX _CS_V7_ENV extern "C" size_t confstr (int in, char *buf, size_t len)