From 2cb24159fbb2a5f8a28d87413b517e6f2b242a0f Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 15 Jan 2018 21:15:28 -0600 Subject: [PATCH] cygwin: add LFS_CFLAGS etc. to confstr/getconf These are used, for instance, when cross-compiling the Linux kernel. Signed-off-by: Yaakov Selkowitz --- newlib/libc/include/sys/unistd.h | 4 ++++ winsup/cygwin/sysconf.cc | 6 +++++- winsup/utils/getconf.c | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/newlib/libc/include/sys/unistd.h b/newlib/libc/include/sys/unistd.h index 05962219a..c811eb649 100644 --- a/newlib/libc/include/sys/unistd.h +++ b/newlib/libc/include/sys/unistd.h @@ -582,6 +582,10 @@ int _EXFUN(unlinkat, (int, const char *, int)); #define _CS_POSIX_V7_THREADS_LDFLAGS 19 #define _CS_V7_ENV 20 #define _CS_V6_ENV _CS_V7_ENV +#define _CS_LFS_CFLAGS 21 +#define _CS_LFS_LDFLAGS 22 +#define _CS_LFS_LIBS 23 +#define _CS_LFS_LINTFLAGS 24 #endif #ifdef __cplusplus diff --git a/winsup/cygwin/sysconf.cc b/winsup/cygwin/sysconf.cc index ecd9aeb93..9563b889a 100644 --- a/winsup/cygwin/sysconf.cc +++ b/winsup/cygwin/sysconf.cc @@ -719,10 +719,14 @@ static struct {ls ("")}, /* _CS_POSIX_V7_THREADS_CFLAGS */ {ls ("")}, /* _CS_POSIX_V7_THREADS_LDFLAGS */ {ls ("POSIXLY_CORRECT=1")}, /* _CS_V7_ENV */ + {ls ("")}, /* _CS_LFS_CFLAGS */ + {ls ("")}, /* _CS_LFS_LDFLAGS */ + {ls ("")}, /* _CS_LFS_LIBS */ + {ls ("")}, /* _CS_LFS_LINTFLAGS */ }; #define CS_MIN _CS_PATH -#define CS_MAX _CS_V7_ENV +#define CS_MAX _CS_LFS_LINTFLAGS extern "C" size_t confstr (int in, char *buf, size_t len) diff --git a/winsup/utils/getconf.c b/winsup/utils/getconf.c index 256bddb1a..5ac84abd2 100644 --- a/winsup/utils/getconf.c +++ b/winsup/utils/getconf.c @@ -97,6 +97,10 @@ static const struct conf_variable conf_table[] = { "XBS5_WIDTH_RESTRICTED_ENVS", CONFSTR, _CS_XBS5_WIDTH_RESTRICTED_ENVS }, { "V7_ENV", CONFSTR, _CS_V7_ENV }, { "V6_ENV", CONFSTR, _CS_V6_ENV }, + { "LFS_CFLAGS", CONFSTR, _CS_LFS_CFLAGS }, + { "LFS_LDFLAGS", CONFSTR, _CS_LFS_LDFLAGS }, + { "LFS_LIBS", CONFSTR, _CS_LFS_LIBS }, + { "LFS_LINTFLAGS", CONFSTR, _CS_LFS_LINTFLAGS }, /* Symbolic constants from */ { "_POSIX_AIO_LISTIO_MAX", CONSTANT, _POSIX_AIO_LISTIO_MAX },