This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.20-35-gd330b98
- From: siddhesh at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 16 Sep 2014 16:55:32 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.20-35-gd330b98
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 d330b980e9ee2349492087a279a9c7bf294f6b47 (commit)
via 02657da2cf4457804ed938ee08b8316249126444 (commit)
via 653b1080fad02725ab66e504a7bfeecf4347d7aa (commit)
via 602f80ec8b966cfad3b61914cbe14ee606cedf6e (commit)
from 545583d664b64ff234b99aca0d85e99c8a55808f (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=d330b980e9ee2349492087a279a9c7bf294f6b47
commit d330b980e9ee2349492087a279a9c7bf294f6b47
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Tue Sep 16 22:20:45 2014 +0530
Remove CFLAGS for interp.c
Replace it with including an auto-generated linker-runtime.h.
Build-tested on x86_64 and found that there was no change in the
generated code.
* elf/Makefile (CFLAGS-interp.c): Remove.
($(elf-objpfx)runtime-linker.h): Generate header with linker
path string.
* elf/interp.c: Include generated runtime-linker.h
diff --git a/ChangeLog b/ChangeLog
index 45b8cde..37907ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2014-09-16 Siddhesh Poyarekar <siddhesh@redhat.com>
+ * elf/Makefile (CFLAGS-interp.c): Remove.
+ ($(elf-objpfx)runtime-linker.h): Generate header with linker
+ path string.
+ * elf/interp.c: Include generated runtime-linker.h
+
* Makerules (lib%.so): Don't include $(+interp) in
prerequisites.
* elf/Makefile (CFLAGS-interp.c): Don't define NOT_IN_libc.
diff --git a/elf/Makefile b/elf/Makefile
index e3bd692..94074f3 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -353,9 +353,16 @@ $(objpfx)ld.so: $(objpfx)librtld.os $(ld-map)
| $(AWK) '($$7 ~ /^UND(|EF)$$/ && $$1 != "0:" && $$4 != "REGISTER") { print; p=1 } END { exit p != 0 }'
mv -f $@.new $@
-# interp.c exists just to get this string into the libraries.
-CFLAGS-interp.c = -D'RUNTIME_LINKER="$(rtlddir)/$(rtld-installed-name)"'
-$(objpfx)interp.os: $(common-objpfx)config.make
+# interp.c exists just to get the runtime linker path into libc.so.
+$(objpfx)interp.os: $(elf-objpfx)runtime-linker.h
+
+$(elf-objpfx)runtime-linker.h: $(elf-objpfx)runtime-linker.st; @:
+$(elf-objpfx)runtime-linker.st: $(common-objpfx)config.make
+ $(name-target-directory)
+ echo '#define RUNTIME_LINKER "$(rtlddir)/$(rtld-installed-name)"' \
+ > ${@:st=T}
+ $(move-if-change) ${@:st=T} ${@:st=h}
+ touch $@
ifneq (ld.so,$(rtld-installed-name))
# Make sure ld.so.1 exists in the build directory so we can link
diff --git a/elf/interp.c b/elf/interp.c
index 49c92f5..a2492bf 100644
--- a/elf/interp.c
+++ b/elf/interp.c
@@ -16,5 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+#include <elf/runtime-linker.h>
+
const char __invoke_dynamic_linker__[] __attribute__ ((section (".interp")))
= RUNTIME_LINKER;
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=02657da2cf4457804ed938ee08b8316249126444
commit 02657da2cf4457804ed938ee08b8316249126444
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Tue Sep 16 22:19:22 2014 +0530
Include .interp section only for libc.so
Barring libc.so and libdl.so, none of the libraries have any entry
points, so it is pointless to add a .interp section for them. The
libdl.so entry point (in dlfcn/eval.c) is also defunct, so remove that
file as well.
Build tested for x86_64, ppc64 and s390x. I have not moved
CFLAGS-interp.c to CPPFLAGS-interp.c isnce I'll be removing it
completely in a follow-up patch.
Siddhesh
* Makerules (lib%.so): Don't include $(+interp) in
prerequisites.
* elf/Makefile (CFLAGS-interp.c): Don't define NOT_IN_libc.
* dlfcn/eval.c: Remove file.
diff --git a/ChangeLog b/ChangeLog
index 72d980f..45b8cde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2014-09-16 Siddhesh Poyarekar <siddhesh@redhat.com>
+ * Makerules (lib%.so): Don't include $(+interp) in
+ prerequisites.
+ * elf/Makefile (CFLAGS-interp.c): Don't define NOT_IN_libc.
+ * dlfcn/eval.c: Remove file.
+
* posix/getconf.c (vars): Don't check for _[SP]C_* and _CS
macros.
diff --git a/Makerules b/Makerules
index 6b30e8c..695c9ab 100644
--- a/Makerules
+++ b/Makerules
@@ -436,7 +436,7 @@ link-libc-deps = $(common-objpfx)libc.so $(common-objpfx)linkobj/libc.so \
# $(LDLIBS-%.so) may contain -l switches to generate run-time dependencies
# on other shared objects. The linking with libc and ld.so is intended
# to be as similar as possible to a default link with an installed libc.
-lib%.so: lib%_pic.a $(+preinit) $(+postinit) $(+interp) $(link-libc-deps)
+lib%.so: lib%_pic.a $(+preinit) $(+postinit) $(link-libc-deps)
$(build-shlib) $(link-libc-args)
define build-shlib-helper
diff --git a/dlfcn/eval.c b/dlfcn/eval.c
deleted file mode 100644
index 9cc307a..0000000
--- a/dlfcn/eval.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/* You don't really want to know what this hack is for.
- Copyright (C) 1996-2014 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
-#include <assert.h>
-#include <ctype.h>
-#include <dlfcn.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-static void *funcall (char **stringp) __attribute_noinline__;
-static void *eval (char **stringp);
-
-
-long int weak_function
-__strtol_internal (const char *nptr, char **endptr, int base, int group)
-{
- unsigned long int result = 0;
- long int sign = 1;
-
- while (*nptr == ' ' || *nptr == '\t')
- ++nptr;
-
- if (*nptr == '-')
- {
- sign = -1;
- ++nptr;
- }
- else if (*nptr == '+')
- ++nptr;
-
- if (*nptr < '0' || *nptr > '9')
- {
- if (endptr != NULL)
- *endptr = (char *) nptr;
- return 0L;
- }
-
- assert (base == 0);
- base = 10;
- if (*nptr == '0')
- {
- if (nptr[1] == 'x' || nptr[1] == 'X')
- {
- base = 16;
- nptr += 2;
- }
- else
- base = 8;
- }
-
- while (*nptr >= '0' && *nptr <= '9')
- {
- unsigned long int digval = *nptr - '0';
- if (result > LONG_MAX / 10
- || (sign > 0 ? result == LONG_MAX / 10 && digval > LONG_MAX % 10
- : (result == ((unsigned long int) LONG_MAX + 1) / 10
- && digval > ((unsigned long int) LONG_MAX + 1) % 10)))
- {
- errno = ERANGE;
- return sign > 0 ? LONG_MAX : LONG_MIN;
- }
- result *= base;
- result += digval;
- ++nptr;
- }
-
- return (long int) result * sign;
-}
-
-
-static void *
-funcall (char **stringp)
-{
- void *args[strlen (*stringp)], **ap = args;
- void *argcookie = &args[1];
-
- do
- {
- /* Evaluate the next token. */
- *ap++ = eval (stringp);
-
- /* Whitespace is irrelevant. */
- while (isspace (**stringp))
- ++*stringp;
-
- /* Terminate at closing paren or end of line. */
- } while (**stringp != '\0' && **stringp != ')');
- if (**stringp != '\0')
- /* Swallow closing paren. */
- ++*stringp;
-
- if (args[0] == NULL)
- {
- static const char unknown[] = "Unknown function\n";
- write (1, unknown, sizeof unknown - 1);
- return NULL;
- }
-
- /* Do it to it. */
- __builtin_return (__builtin_apply (args[0],
- &argcookie,
- (char *) ap - (char *) &args[1]));
-}
-
-static void *
-eval (char **stringp)
-{
- void *value;
- char *p = *stringp, c;
-
- /* Whitespace is irrelevant. */
- while (isspace (*p))
- ++p;
-
- switch (*p)
- {
- case '"':
- /* String constant. */
- value = ++p;
- do
- if (*p == '\\')
- {
- switch (*strcpy (p, p + 1))
- {
- case 't':
- *p = '\t';
- break;
- case 'n':
- *p = '\n';
- break;
- }
- ++p;
- }
- while (*p != '\0' && *p++ != '"');
- if (p[-1] == '"')
- p[-1] = '\0';
- break;
-
- case '(':
- *stringp = ++p;
- return funcall (stringp);
-
- default:
- /* Try to parse it as a number. */
- value = (void *) __strtol_internal (p, stringp, 0, 0);
- if (*stringp != p)
- return value;
-
- /* Anything else is a symbol that produces its address. */
- value = p;
- do
- ++p;
- while (*p != '\0' && !isspace (*p) && (!ispunct (*p) || *p == '_'));
- c = *p;
- *p = '\0';
- value = dlsym (NULL, value);
- *p = c;
- break;
- }
-
- *stringp = p;
- return value;
-}
-
-
-extern void _start (void) __attribute__ ((noreturn));
-void
-__attribute__ ((noreturn))
-_start (void)
-{
- char *buf = NULL;
- size_t bufsz = 0;
-
- while (__getdelim (&buf, &bufsz, '\n', stdin) > 0)
- {
- char *p = buf;
- eval (&p);
- }
-
- exit (0);
-}
diff --git a/elf/Makefile b/elf/Makefile
index 25012cc..e3bd692 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -354,8 +354,7 @@ $(objpfx)ld.so: $(objpfx)librtld.os $(ld-map)
mv -f $@.new $@
# interp.c exists just to get this string into the libraries.
-CFLAGS-interp.c = -D'RUNTIME_LINKER="$(rtlddir)/$(rtld-installed-name)"' \
- -DNOT_IN_libc=1
+CFLAGS-interp.c = -D'RUNTIME_LINKER="$(rtlddir)/$(rtld-installed-name)"'
$(objpfx)interp.os: $(common-objpfx)config.make
ifneq (ld.so,$(rtld-installed-name))
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=653b1080fad02725ab66e504a7bfeecf4347d7aa
commit 653b1080fad02725ab66e504a7bfeecf4347d7aa
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Tue Sep 16 22:18:20 2014 +0530
Assume that all _[PS]C_* and _CS_* macros are always defined
The macros in question are always defined in confname.h for all
variants and there seems to be no reason to allow such variants to
exist anyway.
diff --git a/ChangeLog b/ChangeLog
index 436b3df..72d980f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2014-09-16 Siddhesh Poyarekar <siddhesh@redhat.com>
+ * posix/getconf.c (vars): Don't check for _[SP]C_* and _CS
+ macros.
+
[BZ #17266]
* misc/sys/cdefs.h: Define __extern_always_inline for clang
4.2 and newer.
diff --git a/posix/getconf.c b/posix/getconf.c
index c2c0d3f..14d51d8 100644
--- a/posix/getconf.c
+++ b/posix/getconf.c
@@ -35,981 +35,353 @@ struct conf
static const struct conf vars[] =
{
-#ifdef _PC_LINK_MAX
{ "LINK_MAX", _PC_LINK_MAX, PATHCONF },
-#endif
-#ifdef _PC_LINK_MAX
{ "_POSIX_LINK_MAX", _PC_LINK_MAX, PATHCONF },
-#endif
-#ifdef _PC_MAX_CANON
{ "MAX_CANON", _PC_MAX_CANON, PATHCONF },
-#endif
-#ifdef _PC_MAX_CANON
{ "_POSIX_MAX_CANON", _PC_MAX_CANON, PATHCONF },
-#endif
-#ifdef _PC_MAX_INPUT
{ "MAX_INPUT", _PC_MAX_INPUT, PATHCONF },
-#endif
-#ifdef _PC_MAX_INPUT
{ "_POSIX_MAX_INPUT", _PC_MAX_INPUT, PATHCONF },
-#endif
-#ifdef _PC_NAME_MAX
{ "NAME_MAX", _PC_NAME_MAX, PATHCONF },
-#endif
-#ifdef _PC_NAME_MAX
{ "_POSIX_NAME_MAX", _PC_NAME_MAX, PATHCONF },
-#endif
-#ifdef _PC_PATH_MAX
{ "PATH_MAX", _PC_PATH_MAX, PATHCONF },
-#endif
-#ifdef _PC_PATH_MAX
{ "_POSIX_PATH_MAX", _PC_PATH_MAX, PATHCONF },
-#endif
-#ifdef _PC_PIPE_BUF
{ "PIPE_BUF", _PC_PIPE_BUF, PATHCONF },
-#endif
-#ifdef _PC_PIPE_BUF
{ "_POSIX_PIPE_BUF", _PC_PIPE_BUF, PATHCONF },
-#endif
-#ifdef _PC_SOCK_MAXBUF
{ "SOCK_MAXBUF", _PC_SOCK_MAXBUF, PATHCONF },
-#endif
-#ifdef _PC_ASYNC_IO
{ "_POSIX_ASYNC_IO", _PC_ASYNC_IO, PATHCONF },
-#endif
-#ifdef _PC_CHOWN_RESTRICTED
{ "_POSIX_CHOWN_RESTRICTED", _PC_CHOWN_RESTRICTED, PATHCONF },
-#endif
-#ifdef _PC_NO_TRUNC
{ "_POSIX_NO_TRUNC", _PC_NO_TRUNC, PATHCONF },
-#endif
-#ifdef _PC_PRIO_IO
{ "_POSIX_PRIO_IO", _PC_PRIO_IO, PATHCONF },
-#endif
-#ifdef _PC_SYNC_IO
{ "_POSIX_SYNC_IO", _PC_SYNC_IO, PATHCONF },
-#endif
-#ifdef _PC_VDISABLE
{ "_POSIX_VDISABLE", _PC_VDISABLE, PATHCONF },
-#endif
-#ifdef _SC_ARG_MAX
{ "ARG_MAX", _SC_ARG_MAX, SYSCONF },
-#endif
-#ifdef _SC_ATEXIT_MAX
{ "ATEXIT_MAX", _SC_ATEXIT_MAX, SYSCONF },
-#endif
-#ifdef _SC_CHAR_BIT
{ "CHAR_BIT", _SC_CHAR_BIT, SYSCONF },
-#endif
-#ifdef _SC_CHAR_MAX
{ "CHAR_MAX", _SC_CHAR_MAX, SYSCONF },
-#endif
-#ifdef _SC_CHAR_MIN
{ "CHAR_MIN", _SC_CHAR_MIN, SYSCONF },
-#endif
-#ifdef _SC_CHILD_MAX
{ "CHILD_MAX", _SC_CHILD_MAX, SYSCONF },
-#endif
-#ifdef _SC_CLK_TCK
{ "CLK_TCK", _SC_CLK_TCK, SYSCONF },
-#endif
-#ifdef _SC_INT_MAX
{ "INT_MAX", _SC_INT_MAX, SYSCONF },
-#endif
-#ifdef _SC_INT_MIN
{ "INT_MIN", _SC_INT_MIN, SYSCONF },
-#endif
-#ifdef _SC_UIO_MAXIOV
{ "IOV_MAX", _SC_UIO_MAXIOV, SYSCONF },
-#endif
-#ifdef _SC_LOGIN_NAME_MAX
{ "LOGNAME_MAX", _SC_LOGIN_NAME_MAX, SYSCONF },
-#endif
-#ifdef _SC_LONG_BIT
{ "LONG_BIT", _SC_LONG_BIT, SYSCONF },
-#endif
-#ifdef _SC_MB_LEN_MAX
{ "MB_LEN_MAX", _SC_MB_LEN_MAX, SYSCONF },
-#endif
-#ifdef _SC_NGROUPS_MAX
{ "NGROUPS_MAX", _SC_NGROUPS_MAX, SYSCONF },
-#endif
-#ifdef _SC_NL_ARGMAX
{ "NL_ARGMAX", _SC_NL_ARGMAX, SYSCONF },
-#endif
-#ifdef _SC_NL_LANGMAX
{ "NL_LANGMAX", _SC_NL_LANGMAX, SYSCONF },
-#endif
-#ifdef _SC_NL_MSGMAX
{ "NL_MSGMAX", _SC_NL_MSGMAX, SYSCONF },
-#endif
-#ifdef _SC_NL_NMAX
{ "NL_NMAX", _SC_NL_NMAX, SYSCONF },
-#endif
-#ifdef _SC_NL_SETMAX
{ "NL_SETMAX", _SC_NL_SETMAX, SYSCONF },
-#endif
-#ifdef _SC_NL_TEXTMAX
{ "NL_TEXTMAX", _SC_NL_TEXTMAX, SYSCONF },
-#endif
-#ifdef _SC_GETGR_R_SIZE_MAX
{ "NSS_BUFLEN_GROUP", _SC_GETGR_R_SIZE_MAX, SYSCONF },
-#endif
-#ifdef _SC_GETPW_R_SIZE_MAX
{ "NSS_BUFLEN_PASSWD", _SC_GETPW_R_SIZE_MAX, SYSCONF },
-#endif
-#ifdef _SC_NZERO
{ "NZERO", _SC_NZERO, SYSCONF },
-#endif
-#ifdef _SC_OPEN_MAX
{ "OPEN_MAX", _SC_OPEN_MAX, SYSCONF },
-#endif
-#ifdef _SC_PAGESIZE
{ "PAGESIZE", _SC_PAGESIZE, SYSCONF },
-#endif
-#ifdef _SC_PAGESIZE
{ "PAGE_SIZE", _SC_PAGESIZE, SYSCONF },
-#endif
-#ifdef _SC_PASS_MAX
{ "PASS_MAX", _SC_PASS_MAX, SYSCONF },
-#endif
-#ifdef _SC_THREAD_DESTRUCTOR_ITERATIONS
{ "PTHREAD_DESTRUCTOR_ITERATIONS", _SC_THREAD_DESTRUCTOR_ITERATIONS, SYSCONF },
-#endif
-#ifdef _SC_THREAD_KEYS_MAX
{ "PTHREAD_KEYS_MAX", _SC_THREAD_KEYS_MAX, SYSCONF },
-#endif
-#ifdef _SC_THREAD_STACK_MIN
{ "PTHREAD_STACK_MIN", _SC_THREAD_STACK_MIN, SYSCONF },
-#endif
-#ifdef _SC_THREAD_THREADS_MAX
{ "PTHREAD_THREADS_MAX", _SC_THREAD_THREADS_MAX, SYSCONF },
-#endif
-#ifdef _SC_SCHAR_MAX
{ "SCHAR_MAX", _SC_SCHAR_MAX, SYSCONF },
-#endif
-#ifdef _SC_SCHAR_MIN
{ "SCHAR_MIN", _SC_SCHAR_MIN, SYSCONF },
-#endif
-#ifdef _SC_SHRT_MAX
{ "SHRT_MAX", _SC_SHRT_MAX, SYSCONF },
-#endif
-#ifdef _SC_SHRT_MIN
{ "SHRT_MIN", _SC_SHRT_MIN, SYSCONF },
-#endif
-#ifdef _SC_SSIZE_MAX
{ "SSIZE_MAX", _SC_SSIZE_MAX, SYSCONF },
-#endif
-#ifdef _SC_TTY_NAME_MAX
{ "TTY_NAME_MAX", _SC_TTY_NAME_MAX, SYSCONF },
-#endif
-#ifdef _SC_TZNAME_MAX
{ "TZNAME_MAX", _SC_TZNAME_MAX, SYSCONF },
-#endif
-#ifdef _SC_UCHAR_MAX
{ "UCHAR_MAX", _SC_UCHAR_MAX, SYSCONF },
-#endif
-#ifdef _SC_UINT_MAX
{ "UINT_MAX", _SC_UINT_MAX, SYSCONF },
-#endif
-#ifdef _SC_UIO_MAXIOV
{ "UIO_MAXIOV", _SC_UIO_MAXIOV, SYSCONF },
-#endif
-#ifdef _SC_ULONG_MAX
{ "ULONG_MAX", _SC_ULONG_MAX, SYSCONF },
-#endif
-#ifdef _SC_USHRT_MAX
{ "USHRT_MAX", _SC_USHRT_MAX, SYSCONF },
-#endif
-#ifdef _SC_WORD_BIT
{ "WORD_BIT", _SC_WORD_BIT, SYSCONF },
-#endif
-#ifdef _SC_AVPHYS_PAGES
{ "_AVPHYS_PAGES", _SC_AVPHYS_PAGES, SYSCONF },
-#endif
-#ifdef _SC_NPROCESSORS_CONF
{ "_NPROCESSORS_CONF", _SC_NPROCESSORS_CONF, SYSCONF },
-#endif
-#ifdef _SC_NPROCESSORS_ONLN
{ "_NPROCESSORS_ONLN", _SC_NPROCESSORS_ONLN, SYSCONF },
-#endif
-#ifdef _SC_PHYS_PAGES
{ "_PHYS_PAGES", _SC_PHYS_PAGES, SYSCONF },
-#endif
-#ifdef _SC_ARG_MAX
{ "_POSIX_ARG_MAX", _SC_ARG_MAX, SYSCONF },
-#endif
-#ifdef _SC_ASYNCHRONOUS_IO
{ "_POSIX_ASYNCHRONOUS_IO", _SC_ASYNCHRONOUS_IO, SYSCONF },
-#endif
-#ifdef _SC_CHILD_MAX
{ "_POSIX_CHILD_MAX", _SC_CHILD_MAX, SYSCONF },
-#endif
-#ifdef _SC_FSYNC
{ "_POSIX_FSYNC", _SC_FSYNC, SYSCONF },
-#endif
-#ifdef _SC_JOB_CONTROL
{ "_POSIX_JOB_CONTROL", _SC_JOB_CONTROL, SYSCONF },
-#endif
-#ifdef _SC_MAPPED_FILES
{ "_POSIX_MAPPED_FILES", _SC_MAPPED_FILES, SYSCONF },
-#endif
-#ifdef _SC_MEMLOCK
{ "_POSIX_MEMLOCK", _SC_MEMLOCK, SYSCONF },
-#endif
-#ifdef _SC_MEMLOCK_RANGE
{ "_POSIX_MEMLOCK_RANGE", _SC_MEMLOCK_RANGE, SYSCONF },
-#endif
-#ifdef _SC_MEMORY_PROTECTION
{ "_POSIX_MEMORY_PROTECTION", _SC_MEMORY_PROTECTION, SYSCONF },
-#endif
-#ifdef _SC_MESSAGE_PASSING
{ "_POSIX_MESSAGE_PASSING", _SC_MESSAGE_PASSING, SYSCONF },
-#endif
-#ifdef _SC_NGROUPS_MAX
{ "_POSIX_NGROUPS_MAX", _SC_NGROUPS_MAX, SYSCONF },
-#endif
-#ifdef _SC_OPEN_MAX
{ "_POSIX_OPEN_MAX", _SC_OPEN_MAX, SYSCONF },
-#endif
-#ifdef _SC_PII
{ "_POSIX_PII", _SC_PII, SYSCONF },
-#endif
-#ifdef _SC_PII_INTERNET
{ "_POSIX_PII_INTERNET", _SC_PII_INTERNET, SYSCONF },
-#endif
-#ifdef _SC_PII_INTERNET_DGRAM
{ "_POSIX_PII_INTERNET_DGRAM", _SC_PII_INTERNET_DGRAM, SYSCONF },
-#endif
-#ifdef _SC_PII_INTERNET_STREAM
{ "_POSIX_PII_INTERNET_STREAM", _SC_PII_INTERNET_STREAM, SYSCONF },
-#endif
-#ifdef _SC_PII_OSI
{ "_POSIX_PII_OSI", _SC_PII_OSI, SYSCONF },
-#endif
-#ifdef _SC_PII_OSI_CLTS
{ "_POSIX_PII_OSI_CLTS", _SC_PII_OSI_CLTS, SYSCONF },
-#endif
-#ifdef _SC_PII_OSI_COTS
{ "_POSIX_PII_OSI_COTS", _SC_PII_OSI_COTS, SYSCONF },
-#endif
-#ifdef _SC_PII_OSI_M
{ "_POSIX_PII_OSI_M", _SC_PII_OSI_M, SYSCONF },
-#endif
-#ifdef _SC_PII_SOCKET
{ "_POSIX_PII_SOCKET", _SC_PII_SOCKET, SYSCONF },
-#endif
-#ifdef _SC_PII_XTI
{ "_POSIX_PII_XTI", _SC_PII_XTI, SYSCONF },
-#endif
-#ifdef _SC_POLL
{ "_POSIX_POLL", _SC_POLL, SYSCONF },
-#endif
-#ifdef _SC_PRIORITIZED_IO
{ "_POSIX_PRIORITIZED_IO", _SC_PRIORITIZED_IO, SYSCONF },
-#endif
-#ifdef _SC_PRIORITY_SCHEDULING
{ "_POSIX_PRIORITY_SCHEDULING", _SC_PRIORITY_SCHEDULING, SYSCONF },
-#endif
-#ifdef _SC_REALTIME_SIGNALS
{ "_POSIX_REALTIME_SIGNALS", _SC_REALTIME_SIGNALS, SYSCONF },
-#endif
-#ifdef _SC_SAVED_IDS
{ "_POSIX_SAVED_IDS", _SC_SAVED_IDS, SYSCONF },
-#endif
-#ifdef _SC_SELECT
{ "_POSIX_SELECT", _SC_SELECT, SYSCONF },
-#endif
-#ifdef _SC_SEMAPHORES
{ "_POSIX_SEMAPHORES", _SC_SEMAPHORES, SYSCONF },
-#endif
-#ifdef _SC_SHARED_MEMORY_OBJECTS
{ "_POSIX_SHARED_MEMORY_OBJECTS", _SC_SHARED_MEMORY_OBJECTS, SYSCONF },
-#endif
-#ifdef _SC_SSIZE_MAX
{ "_POSIX_SSIZE_MAX", _SC_SSIZE_MAX, SYSCONF },
-#endif
-#ifdef _SC_STREAM_MAX
{ "_POSIX_STREAM_MAX", _SC_STREAM_MAX, SYSCONF },
-#endif
-#ifdef _SC_SYNCHRONIZED_IO
{ "_POSIX_SYNCHRONIZED_IO", _SC_SYNCHRONIZED_IO, SYSCONF },
-#endif
-#ifdef _SC_THREADS
{ "_POSIX_THREADS", _SC_THREADS, SYSCONF },
-#endif
-#ifdef _SC_THREAD_ATTR_STACKADDR
{ "_POSIX_THREAD_ATTR_STACKADDR", _SC_THREAD_ATTR_STACKADDR, SYSCONF },
-#endif
-#ifdef _SC_THREAD_ATTR_STACKSIZE
{ "_POSIX_THREAD_ATTR_STACKSIZE", _SC_THREAD_ATTR_STACKSIZE, SYSCONF },
-#endif
-#ifdef _SC_THREAD_PRIORITY_SCHEDULING
{ "_POSIX_THREAD_PRIORITY_SCHEDULING", _SC_THREAD_PRIORITY_SCHEDULING, SYSCONF },
-#endif
-#ifdef _SC_THREAD_PRIO_INHERIT
{ "_POSIX_THREAD_PRIO_INHERIT", _SC_THREAD_PRIO_INHERIT, SYSCONF },
-#endif
-#ifdef _SC_THREAD_PRIO_PROTECT
{ "_POSIX_THREAD_PRIO_PROTECT", _SC_THREAD_PRIO_PROTECT, SYSCONF },
-#endif
-#ifdef _SC_THREAD_ROBUST_PRIO_INHERIT
{ "_POSIX_THREAD_ROBUST_PRIO_INHERIT", _SC_THREAD_ROBUST_PRIO_INHERIT,
SYSCONF },
-#endif
-#ifdef _SC_THREAD_ROBUST_PRIO_PROTECT
{ "_POSIX_THREAD_ROBUST_PRIO_PROTECT", _SC_THREAD_ROBUST_PRIO_PROTECT,
SYSCONF },
-#endif
-#ifdef _SC_THREAD_PROCESS_SHARED
{ "_POSIX_THREAD_PROCESS_SHARED", _SC_THREAD_PROCESS_SHARED, SYSCONF },
-#endif
-#ifdef _SC_THREAD_SAFE_FUNCTIONS
{ "_POSIX_THREAD_SAFE_FUNCTIONS", _SC_THREAD_SAFE_FUNCTIONS, SYSCONF },
-#endif
-#ifdef _SC_TIMERS
{ "_POSIX_TIMERS", _SC_TIMERS, SYSCONF },
-#endif
-#ifdef _SC_TIMER_MAX
{ "TIMER_MAX", _SC_TIMER_MAX, SYSCONF },
-#endif
-#ifdef _SC_TZNAME_MAX
{ "_POSIX_TZNAME_MAX", _SC_TZNAME_MAX, SYSCONF },
-#endif
-#ifdef _SC_VERSION
{ "_POSIX_VERSION", _SC_VERSION, SYSCONF },
-#endif
-#ifdef _SC_T_IOV_MAX
{ "_T_IOV_MAX", _SC_T_IOV_MAX, SYSCONF },
-#endif
-#ifdef _SC_XOPEN_CRYPT
{ "_XOPEN_CRYPT", _SC_XOPEN_CRYPT, SYSCONF },
-#endif
-#ifdef _SC_XOPEN_ENH_I18N
{ "_XOPEN_ENH_I18N", _SC_XOPEN_ENH_I18N, SYSCONF },
-#endif
-#ifdef _SC_XOPEN_LEGACY
{ "_XOPEN_LEGACY", _SC_XOPEN_LEGACY, SYSCONF },
-#endif
-#ifdef _SC_XOPEN_REALTIME
{ "_XOPEN_REALTIME", _SC_XOPEN_REALTIME, SYSCONF },
-#endif
-#ifdef _SC_XOPEN_REALTIME_THREADS
{ "_XOPEN_REALTIME_THREADS", _SC_XOPEN_REALTIME_THREADS, SYSCONF },
-#endif
-#ifdef _SC_XOPEN_SHM
{ "_XOPEN_SHM", _SC_XOPEN_SHM, SYSCONF },
-#endif
-#ifdef _SC_XOPEN_UNIX
{ "_XOPEN_UNIX", _SC_XOPEN_UNIX, SYSCONF },
-#endif
-#ifdef _SC_XOPEN_VERSION
{ "_XOPEN_VERSION", _SC_XOPEN_VERSION, SYSCONF },
-#endif
-#ifdef _SC_XOPEN_XCU_VERSION
{ "_XOPEN_XCU_VERSION", _SC_XOPEN_XCU_VERSION, SYSCONF },
-#endif
-#ifdef _SC_XOPEN_XPG2
{ "_XOPEN_XPG2", _SC_XOPEN_XPG2, SYSCONF },
-#endif
-#ifdef _SC_XOPEN_XPG3
{ "_XOPEN_XPG3", _SC_XOPEN_XPG3, SYSCONF },
-#endif
-#ifdef _SC_XOPEN_XPG4
{ "_XOPEN_XPG4", _SC_XOPEN_XPG4, SYSCONF },
-#endif
/* POSIX.2 */
-#ifdef _SC_BC_BASE_MAX
{ "BC_BASE_MAX", _SC_BC_BASE_MAX, SYSCONF },
-#endif
-#ifdef _SC_BC_DIM_MAX
{ "BC_DIM_MAX", _SC_BC_DIM_MAX, SYSCONF },
-#endif
-#ifdef _SC_BC_SCALE_MAX
{ "BC_SCALE_MAX", _SC_BC_SCALE_MAX, SYSCONF },
-#endif
-#ifdef _SC_BC_STRING_MAX
{ "BC_STRING_MAX", _SC_BC_STRING_MAX, SYSCONF },
-#endif
{ "CHARCLASS_NAME_MAX", _SC_CHARCLASS_NAME_MAX, SYSCONF },
-#ifdef _SC_COLL_WEIGHTS_MAX
{ "COLL_WEIGHTS_MAX", _SC_COLL_WEIGHTS_MAX, SYSCONF },
-#endif
-#ifdef _SC_EQUIV_CLASS_MAX
{ "EQUIV_CLASS_MAX", _SC_EQUIV_CLASS_MAX, SYSCONF },
-#endif
-#ifdef _SC_EXPR_NEST_MAX
{ "EXPR_NEST_MAX", _SC_EXPR_NEST_MAX, SYSCONF },
-#endif
-#ifdef _SC_LINE_MAX
{ "LINE_MAX", _SC_LINE_MAX, SYSCONF },
-#endif
-#ifdef _SC_BC_BASE_MAX
{ "POSIX2_BC_BASE_MAX", _SC_BC_BASE_MAX, SYSCONF },
-#endif
-#ifdef _SC_BC_DIM_MAX
{ "POSIX2_BC_DIM_MAX", _SC_BC_DIM_MAX, SYSCONF },
-#endif
-#ifdef _SC_BC_SCALE_MAX
{ "POSIX2_BC_SCALE_MAX", _SC_BC_SCALE_MAX, SYSCONF },
-#endif
-#ifdef _SC_BC_STRING_MAX
{ "POSIX2_BC_STRING_MAX", _SC_BC_STRING_MAX, SYSCONF },
-#endif
-#ifdef _SC_2_CHAR_TERM
{ "POSIX2_CHAR_TERM", _SC_2_CHAR_TERM, SYSCONF },
-#endif
-#ifdef _SC_COLL_WEIGHTS_MAX
{ "POSIX2_COLL_WEIGHTS_MAX", _SC_COLL_WEIGHTS_MAX, SYSCONF },
-#endif
-#ifdef _SC_2_C_BIND
{ "POSIX2_C_BIND", _SC_2_C_BIND, SYSCONF },
-#endif
-#ifdef _SC_2_C_DEV
{ "POSIX2_C_DEV", _SC_2_C_DEV, SYSCONF },
-#endif
-#ifdef _SC_2_C_VERSION
{ "POSIX2_C_VERSION", _SC_2_C_VERSION, SYSCONF },
-#endif
-#ifdef _SC_EXPR_NEST_MAX
{ "POSIX2_EXPR_NEST_MAX", _SC_EXPR_NEST_MAX, SYSCONF },
-#endif
-#ifdef _SC_2_FORT_DEV
{ "POSIX2_FORT_DEV", _SC_2_FORT_DEV, SYSCONF },
-#endif
-#ifdef _SC_2_FORT_RUN
{ "POSIX2_FORT_RUN", _SC_2_FORT_RUN, SYSCONF },
-#endif
-#ifdef _SC_LINE_MAX
{ "_POSIX2_LINE_MAX", _SC_LINE_MAX, SYSCONF },
{ "POSIX2_LINE_MAX", _SC_LINE_MAX, SYSCONF },
-#endif
-#ifdef _SC_2_LOCALEDEF
{ "POSIX2_LOCALEDEF", _SC_2_LOCALEDEF, SYSCONF },
-#endif
-#ifdef _SC_RE_DUP_MAX
{ "POSIX2_RE_DUP_MAX", _SC_RE_DUP_MAX, SYSCONF },
-#endif
-#ifdef _SC_2_SW_DEV
{ "POSIX2_SW_DEV", _SC_2_SW_DEV, SYSCONF },
-#endif
-#ifdef _SC_2_UPE
{ "POSIX2_UPE", _SC_2_UPE, SYSCONF },
-#endif
-#ifdef _SC_2_VERSION
{ "POSIX2_VERSION", _SC_2_VERSION, SYSCONF },
-#endif
-#ifdef _SC_RE_DUP_MAX
{ "RE_DUP_MAX", _SC_RE_DUP_MAX, SYSCONF },
-#endif
-#ifdef _CS_PATH
{ "PATH", _CS_PATH, CONFSTR },
{ "CS_PATH", _CS_PATH, CONFSTR },
-#endif
/* LFS */
-#ifdef _CS_LFS_CFLAGS
{ "LFS_CFLAGS", _CS_LFS_CFLAGS, CONFSTR },
-#endif
-#ifdef _CS_LFS_LDFLAGS
{ "LFS_LDFLAGS", _CS_LFS_LDFLAGS, CONFSTR },
-#endif
-#ifdef _CS_LFS_LIBS
{ "LFS_LIBS", _CS_LFS_LIBS, CONFSTR },
-#endif
-#ifdef _CS_LFS_LINTFLAGS
{ "LFS_LINTFLAGS", _CS_LFS_LINTFLAGS, CONFSTR },
-#endif
-#ifdef _CS_LFS64_CFLAGS
{ "LFS64_CFLAGS", _CS_LFS64_CFLAGS, CONFSTR },
-#endif
-#ifdef _CS_LFS64_LDFLAGS
{ "LFS64_LDFLAGS", _CS_LFS64_LDFLAGS, CONFSTR },
-#endif
-#ifdef _CS_LFS64_LIBS
{ "LFS64_LIBS", _CS_LFS64_LIBS, CONFSTR },
-#endif
-#ifdef _CS_LFS64_LINTFLAGS
{ "LFS64_LINTFLAGS", _CS_LFS64_LINTFLAGS, CONFSTR },
-#endif
/* Programming environments. */
-#ifdef _CS_V5_WIDTH_RESTRICTED_ENVS
{ "_XBS5_WIDTH_RESTRICTED_ENVS", _CS_V5_WIDTH_RESTRICTED_ENVS, CONFSTR },
{ "XBS5_WIDTH_RESTRICTED_ENVS", _CS_V5_WIDTH_RESTRICTED_ENVS, CONFSTR },
-#endif
-#ifdef _SC_XBS5_ILP32_OFF32
{ "_XBS5_ILP32_OFF32", _SC_XBS5_ILP32_OFF32, SYSCONF },
-#endif
-#ifdef _CS_XBS5_ILP32_OFF32_CFLAGS
{ "XBS5_ILP32_OFF32_CFLAGS", _CS_XBS5_ILP32_OFF32_CFLAGS, CONFSTR },
-#endif
-#ifdef _CS_XBS5_ILP32_OFF32_LDFLAGS
{ "XBS5_ILP32_OFF32_LDFLAGS", _CS_XBS5_ILP32_OFF32_LDFLAGS, CONFSTR },
-#endif
-#ifdef _CS_XBS5_ILP32_OFF32_LIBS
{ "XBS5_ILP32_OFF32_LIBS", _CS_XBS5_ILP32_OFF32_LIBS, CONFSTR },
-#endif
-#ifdef _CS_XBS5_ILP32_OFF32_LINTFLAGS
{ "XBS5_ILP32_OFF32_LINTFLAGS", _CS_XBS5_ILP32_OFF32_LINTFLAGS, CONFSTR },
-#endif
-#ifdef _SC_XBS5_ILP32_OFFBIG
{ "_XBS5_ILP32_OFFBIG", _SC_XBS5_ILP32_OFFBIG, SYSCONF },
-#endif
-#ifdef _CS_XBS5_ILP32_OFFBIG_CFLAGS
{ "XBS5_ILP32_OFFBIG_CFLAGS", _CS_XBS5_ILP32_OFFBIG_CFLAGS, CONFSTR },
-#endif
-#ifdef _CS_XBS5_ILP32_OFFBIG_LDFLAGS
{ "XBS5_ILP32_OFFBIG_LDFLAGS", _CS_XBS5_ILP32_OFFBIG_LDFLAGS, CONFSTR },
-#endif
-#ifdef _CS_XBS5_ILP32_OFFBIG_LIBS
{ "XBS5_ILP32_OFFBIG_LIBS", _CS_XBS5_ILP32_OFFBIG_LIBS, CONFSTR },
-#endif
-#ifdef _CS_XBS5_ILP32_OFFBIG_LINTFLAGS
{ "XBS5_ILP32_OFFBIG_LINTFLAGS", _CS_XBS5_ILP32_OFFBIG_LINTFLAGS, CONFSTR },
-#endif
-#ifdef _SC_XBS5_LP64_OFF64
{ "_XBS5_LP64_OFF64", _SC_XBS5_LP64_OFF64, SYSCONF },
-#endif
-#ifdef _CS_XBS5_LP64_OFF64_CFLAGS
{ "XBS5_LP64_OFF64_CFLAGS", _CS_XBS5_LP64_OFF64_CFLAGS, CONFSTR },
-#endif
-#ifdef _CS_XBS5_LP64_OFF64_LDFLAGS
{ "XBS5_LP64_OFF64_LDFLAGS", _CS_XBS5_LP64_OFF64_LDFLAGS, CONFSTR },
-#endif
-#ifdef _CS_XBS5_LP64_OFF64_LIBS
{ "XBS5_LP64_OFF64_LIBS", _CS_XBS5_LP64_OFF64_LIBS, CONFSTR },
-#endif
-#ifdef _CS_XBS5_LP64_OFF64_LINTFLAGS
{ "XBS5_LP64_OFF64_LINTFLAGS", _CS_XBS5_LP64_OFF64_LINTFLAGS, CONFSTR },
-#endif
-#ifdef _SC_XBS5_LPBIG_OFFBIG
{ "_XBS5_LPBIG_OFFBIG", _SC_XBS5_LPBIG_OFFBIG, SYSCONF },
-#endif
-#ifdef _CS_XBS5_LPBIG_OFFBIG_CFLAGS
{ "XBS5_LPBIG_OFFBIG_CFLAGS", _CS_XBS5_LPBIG_OFFBIG_CFLAGS, CONFSTR },
-#endif
-#ifdef _CS_XBS5_LPBIG_OFFBIG_LDFLAGS
{ "XBS5_LPBIG_OFFBIG_LDFLAGS", _CS_XBS5_LPBIG_OFFBIG_LDFLAGS, CONFSTR },
-#endif
-#ifdef _CS_XBS5_LPBIG_OFFBIG_LIBS
{ "XBS5_LPBIG_OFFBIG_LIBS", _CS_XBS5_LPBIG_OFFBIG_LIBS, CONFSTR },
-#endif
-#ifdef _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS
{ "XBS5_LPBIG_OFFBIG_LINTFLAGS", _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS, CONFSTR },
-#endif
-#ifdef _SC_V6_ILP32_OFF32
{ "_POSIX_V6_ILP32_OFF32", _SC_V6_ILP32_OFF32, SYSCONF },
-#endif
-#ifdef _CS_POSIX_V6_ILP32_OFF32_CFLAGS
{ "POSIX_V6_ILP32_OFF32_CFLAGS", _CS_POSIX_V6_ILP32_OFF32_CFLAGS, CONFSTR },
-#endif
-#ifdef _CS_POSIX_V6_ILP32_OFF32_LDFLAGS
{ "POSIX_V6_ILP32_OFF32_LDFLAGS", _CS_POSIX_V6_ILP32_OFF32_LDFLAGS, CONFSTR },
-#endif
-#ifdef _CS_POSIX_V6_ILP32_OFF32_LIBS
{ "POSIX_V6_ILP32_OFF32_LIBS", _CS_POSIX_V6_ILP32_OFF32_LIBS, CONFSTR },
-#endif
-#ifdef _CS_POSIX_V6_ILP32_OFF32_LINTFLAGS
{ "POSIX_V6_ILP32_OFF32_LINTFLAGS", _CS_POSIX_V6_ILP32_OFF32_LINTFLAGS, CONFSTR },
-#endif
-#ifdef _CS_V6_WIDTH_RESTRICTED_ENVS
{ "_POSIX_V6_WIDTH_RESTRICTED_ENVS", _CS_V6_WIDTH_RESTRICTED_ENVS, CONFSTR },
{ "POSIX_V6_WIDTH_RESTRICTED_ENVS", _CS_V6_WIDTH_RESTRICTED_ENVS, CONFSTR },
-#endif
-#ifdef _SC_V6_ILP32_OFFBIG
{ "_POSIX_V6_ILP32_OFFBIG", _SC_V6_ILP32_OFFBIG, SYSCONF },
-#endif
-#ifdef _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS
{ "POSIX_V6_ILP32_OFFBIG_CFLAGS", _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS, CONFSTR },
-#endif
-#ifdef _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS
{ "POSIX_V6_ILP32_OFFBIG_LDFLAGS", _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS, CONFSTR },
-#endif
-#ifdef _CS_POSIX_V6_ILP32_OFFBIG_LIBS
{ "POSIX_V6_ILP32_OFFBIG_LIBS", _CS_POSIX_V6_ILP32_OFFBIG_LIBS, CONFSTR },
-#endif
-#ifdef _CS_POSIX_V6_ILP32_OFFBIG_LINTFLAGS
{ "POSIX_V6_ILP32_OFFBIG_LINTFLAGS", _CS_POSIX_V6_ILP32_OFFBIG_LINTFLAGS, CONFSTR },
-#endif
-#ifdef _SC_V6_LP64_OFF64
{ "_POSIX_V6_LP64_OFF64", _SC_V6_LP64_OFF64, SYSCONF },
-#endif
-#ifdef _CS_POSIX_V6_LP64_OFF64_CFLAGS
{ "POSIX_V6_LP64_OFF64_CFLAGS", _CS_POSIX_V6_LP64_OFF64_CFLAGS, CONFSTR },
-#endif
-#ifdef _CS_POSIX_V6_LP64_OFF64_LDFLAGS
{ "POSIX_V6_LP64_OFF64_LDFLAGS", _CS_POSIX_V6_LP64_OFF64_LDFLAGS, CONFSTR },
-#endif
-#ifdef _CS_POSIX_V6_LP64_OFF64_LIBS
{ "POSIX_V6_LP64_OFF64_LIBS", _CS_POSIX_V6_LP64_OFF64_LIBS, CONFSTR },
-#endif
-#ifdef _CS_POSIX_V6_LP64_OFF64_LINTFLAGS
{ "POSIX_V6_LP64_OFF64_LINTFLAGS", _CS_POSIX_V6_LP64_OFF64_LINTFLAGS, CONFSTR },
-#endif
-#ifdef _SC_V6_LPBIG_OFFBIG
{ "_POSIX_V6_LPBIG_OFFBIG", _SC_V6_LPBIG_OFFBIG, SYSCONF },
-#endif
-#ifdef _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS
{ "POSIX_V6_LPBIG_OFFBIG_CFLAGS", _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS, CONFSTR },
-#endif
-#ifdef _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS
{ "POSIX_V6_LPBIG_OFFBIG_LDFLAGS", _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS, CONFSTR },
-#endif
-#ifdef _CS_POSIX_V6_LPBIG_OFFBIG_LIBS
{ "POSIX_V6_LPBIG_OFFBIG_LIBS", _CS_POSIX_V6_LPBIG_OFFBIG_LIBS, CONFSTR },
-#endif
-#ifdef _CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS
{ "POSIX_V6_LPBIG_OFFBIG_LINTFLAGS", _CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS, CONFSTR },
-#endif
-#ifdef _SC_V7_ILP32_OFF32
{ "_POSIX_V7_ILP32_OFF32", _SC_V7_ILP32_OFF32, SYSCONF },
-#endif
-#ifdef _CS_POSIX_V7_ILP32_OFF32_CFLAGS
{ "POSIX_V7_ILP32_OFF32_CFLAGS", _CS_POSIX_V7_ILP32_OFF32_CFLAGS, CONFSTR },
-#endif
-#ifdef _CS_POSIX_V7_ILP32_OFF32_LDFLAGS
{ "POSIX_V7_ILP32_OFF32_LDFLAGS", _CS_POSIX_V7_ILP32_OFF32_LDFLAGS, CONFSTR },
-#endif
-#ifdef _CS_POSIX_V7_ILP32_OFF32_LIBS
{ "POSIX_V7_ILP32_OFF32_LIBS", _CS_POSIX_V7_ILP32_OFF32_LIBS, CONFSTR },
-#endif
-#ifdef _CS_POSIX_V7_ILP32_OFF32_LINTFLAGS
{ "POSIX_V7_ILP32_OFF32_LINTFLAGS", _CS_POSIX_V7_ILP32_OFF32_LINTFLAGS, CONFSTR },
-#endif
-#ifdef _CS_V7_WIDTH_RESTRICTED_ENVS
{ "_POSIX_V7_WIDTH_RESTRICTED_ENVS", _CS_V7_WIDTH_RESTRICTED_ENVS, CONFSTR },
{ "POSIX_V7_WIDTH_RESTRICTED_ENVS", _CS_V7_WIDTH_RESTRICTED_ENVS, CONFSTR },
-#endif
-#ifdef _SC_V7_ILP32_OFFBIG
{ "_POSIX_V7_ILP32_OFFBIG", _SC_V7_ILP32_OFFBIG, SYSCONF },
-#endif
-#ifdef _CS_POSIX_V7_ILP32_OFFBIG_CFLAGS
{ "POSIX_V7_ILP32_OFFBIG_CFLAGS", _CS_POSIX_V7_ILP32_OFFBIG_CFLAGS, CONFSTR },
-#endif
-#ifdef _CS_POSIX_V7_ILP32_OFFBIG_LDFLAGS
{ "POSIX_V7_ILP32_OFFBIG_LDFLAGS", _CS_POSIX_V7_ILP32_OFFBIG_LDFLAGS, CONFSTR },
-#endif
-#ifdef _CS_POSIX_V7_ILP32_OFFBIG_LIBS
{ "POSIX_V7_ILP32_OFFBIG_LIBS", _CS_POSIX_V7_ILP32_OFFBIG_LIBS, CONFSTR },
-#endif
-#ifdef _CS_POSIX_V7_ILP32_OFFBIG_LINTFLAGS
{ "POSIX_V7_ILP32_OFFBIG_LINTFLAGS", _CS_POSIX_V7_ILP32_OFFBIG_LINTFLAGS, CONFSTR },
-#endif
-#ifdef _SC_V7_LP64_OFF64
{ "_POSIX_V7_LP64_OFF64", _SC_V7_LP64_OFF64, SYSCONF },
-#endif
-#ifdef _CS_POSIX_V7_LP64_OFF64_CFLAGS
{ "POSIX_V7_LP64_OFF64_CFLAGS", _CS_POSIX_V7_LP64_OFF64_CFLAGS, CONFSTR },
-#endif
-#ifdef _CS_POSIX_V7_LP64_OFF64_LDFLAGS
{ "POSIX_V7_LP64_OFF64_LDFLAGS", _CS_POSIX_V7_LP64_OFF64_LDFLAGS, CONFSTR },
-#endif
-#ifdef _CS_POSIX_V7_LP64_OFF64_LIBS
{ "POSIX_V7_LP64_OFF64_LIBS", _CS_POSIX_V7_LP64_OFF64_LIBS, CONFSTR },
-#endif
-#ifdef _CS_POSIX_V7_LP64_OFF64_LINTFLAGS
{ "POSIX_V7_LP64_OFF64_LINTFLAGS", _CS_POSIX_V7_LP64_OFF64_LINTFLAGS, CONFSTR },
-#endif
-#ifdef _SC_V7_LPBIG_OFFBIG
{ "_POSIX_V7_LPBIG_OFFBIG", _SC_V7_LPBIG_OFFBIG, SYSCONF },
-#endif
-#ifdef _CS_POSIX_V7_LPBIG_OFFBIG_CFLAGS
{ "POSIX_V7_LPBIG_OFFBIG_CFLAGS", _CS_POSIX_V7_LPBIG_OFFBIG_CFLAGS, CONFSTR },
-#endif
-#ifdef _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS
{ "POSIX_V7_LPBIG_OFFBIG_LDFLAGS", _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS, CONFSTR },
-#endif
-#ifdef _CS_POSIX_V7_LPBIG_OFFBIG_LIBS
{ "POSIX_V7_LPBIG_OFFBIG_LIBS", _CS_POSIX_V7_LPBIG_OFFBIG_LIBS, CONFSTR },
-#endif
-#ifdef _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS
{ "POSIX_V7_LPBIG_OFFBIG_LINTFLAGS", _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS, CONFSTR },
-#endif
-#ifdef _SC_ADVISORY_INFO
{ "_POSIX_ADVISORY_INFO", _SC_ADVISORY_INFO, SYSCONF },
-#endif
-#ifdef _SC_BARRIERS
{ "_POSIX_BARRIERS", _SC_BARRIERS, SYSCONF },
-#endif
-#ifdef _SC_BASE
{ "_POSIX_BASE", _SC_BASE, SYSCONF },
-#endif
-#ifdef _SC_C_LANG_SUPPORT
{ "_POSIX_C_LANG_SUPPORT", _SC_C_LANG_SUPPORT, SYSCONF },
-#endif
-#ifdef _SC_C_LANG_SUPPORT_R
{ "_POSIX_C_LANG_SUPPORT_R", _SC_C_LANG_SUPPORT_R, SYSCONF },
-#endif
-#ifdef _SC_CLOCK_SELECTION
{ "_POSIX_CLOCK_SELECTION", _SC_CLOCK_SELECTION, SYSCONF },
-#endif
-#ifdef _SC_CPUTIME
{ "_POSIX_CPUTIME", _SC_CPUTIME, SYSCONF },
-#endif
-#ifdef _SC_THREAD_CPUTIME
{ "_POSIX_THREAD_CPUTIME", _SC_THREAD_CPUTIME, SYSCONF },
-#endif
-#ifdef _SC_DEVICE_SPECIFIC
{ "_POSIX_DEVICE_SPECIFIC", _SC_DEVICE_SPECIFIC, SYSCONF },
-#endif
-#ifdef _SC_DEVICE_SPECIFIC_R
{ "_POSIX_DEVICE_SPECIFIC_R", _SC_DEVICE_SPECIFIC_R, SYSCONF },
-#endif
-#ifdef _SC_FD_MGMT
{ "_POSIX_FD_MGMT", _SC_FD_MGMT, SYSCONF },
-#endif
-#ifdef _SC_FIFO
{ "_POSIX_FIFO", _SC_FIFO, SYSCONF },
-#endif
-#ifdef _SC_PIPE
{ "_POSIX_PIPE", _SC_PIPE, SYSCONF },
-#endif
-#ifdef _SC_FILE_ATTRIBUTES
{ "_POSIX_FILE_ATTRIBUTES", _SC_FILE_ATTRIBUTES, SYSCONF },
-#endif
-#ifdef _SC_FILE_LOCKING
{ "_POSIX_FILE_LOCKING", _SC_FILE_LOCKING, SYSCONF },
-#endif
-#ifdef _SC_FILE_SYSTEM
{ "_POSIX_FILE_SYSTEM", _SC_FILE_SYSTEM, SYSCONF },
-#endif
-#ifdef _SC_MONOTONIC_CLOCK
{ "_POSIX_MONOTONIC_CLOCK", _SC_MONOTONIC_CLOCK, SYSCONF },
-#endif
-#ifdef _SC_MULTI_PROCESS
{ "_POSIX_MULTI_PROCESS", _SC_MULTI_PROCESS, SYSCONF },
-#endif
-#ifdef _SC_SINGLE_PROCESS
{ "_POSIX_SINGLE_PROCESS", _SC_SINGLE_PROCESS, SYSCONF },
-#endif
-#ifdef _SC_NETWORKING
{ "_POSIX_NETWORKING", _SC_NETWORKING, SYSCONF },
-#endif
-#ifdef _SC_READER_WRITER_LOCKS
{ "_POSIX_READER_WRITER_LOCKS", _SC_READER_WRITER_LOCKS, SYSCONF },
-#endif
-#ifdef _SC_SPIN_LOCKS
{ "_POSIX_SPIN_LOCKS", _SC_SPIN_LOCKS, SYSCONF },
-#endif
-#ifdef _SC_REGEXP
{ "_POSIX_REGEXP", _SC_REGEXP, SYSCONF },
-#endif
-#ifdef _SC_REGEX_VERSION
{ "_REGEX_VERSION", _SC_REGEX_VERSION, SYSCONF },
-#endif
-#ifdef _SC_SHELL
{ "_POSIX_SHELL", _SC_SHELL, SYSCONF },
-#endif
-#ifdef _SC_SIGNALS
{ "_POSIX_SIGNALS", _SC_SIGNALS, SYSCONF },
-#endif
-#ifdef _SC_SPAWN
{ "_POSIX_SPAWN", _SC_SPAWN, SYSCONF },
-#endif
-#ifdef _SC_SPORADIC_SERVER
{ "_POSIX_SPORADIC_SERVER", _SC_SPORADIC_SERVER, SYSCONF },
-#endif
-#ifdef _SC_THREAD_SPORADIC_SERVER
{ "_POSIX_THREAD_SPORADIC_SERVER", _SC_THREAD_SPORADIC_SERVER, SYSCONF },
-#endif
-#ifdef _SC_SYSTEM_DATABASE
{ "_POSIX_SYSTEM_DATABASE", _SC_SYSTEM_DATABASE, SYSCONF },
-#endif
-#ifdef _SC_SYSTEM_DATABASE_R
{ "_POSIX_SYSTEM_DATABASE_R", _SC_SYSTEM_DATABASE_R, SYSCONF },
-#endif
-#ifdef _SC_TIMEOUTS
{ "_POSIX_TIMEOUTS", _SC_TIMEOUTS, SYSCONF },
-#endif
-#ifdef _SC_TYPED_MEMORY_OBJECTS
{ "_POSIX_TYPED_MEMORY_OBJECTS", _SC_TYPED_MEMORY_OBJECTS, SYSCONF },
-#endif
-#ifdef _SC_USER_GROUPS
{ "_POSIX_USER_GROUPS", _SC_USER_GROUPS, SYSCONF },
-#endif
-#ifdef _SC_USER_GROUPS_R
{ "_POSIX_USER_GROUPS_R", _SC_USER_GROUPS_R, SYSCONF },
-#endif
-#ifdef _SC_2_PBS
{ "POSIX2_PBS", _SC_2_PBS, SYSCONF },
-#endif
-#ifdef _SC_2_PBS_ACCOUNTING
{ "POSIX2_PBS_ACCOUNTING", _SC_2_PBS_ACCOUNTING, SYSCONF },
-#endif
-#ifdef _SC_2_PBS_LOCATE
{ "POSIX2_PBS_LOCATE", _SC_2_PBS_LOCATE, SYSCONF },
-#endif
-#ifdef _SC_2_PBS_TRACK
{ "POSIX2_PBS_TRACK", _SC_2_PBS_TRACK, SYSCONF },
-#endif
-#ifdef _SC_2_PBS_MESSAGE
{ "POSIX2_PBS_MESSAGE", _SC_2_PBS_MESSAGE, SYSCONF },
-#endif
-#ifdef _SC_SYMLOOP_MAX
{ "SYMLOOP_MAX", _SC_SYMLOOP_MAX, SYSCONF },
-#endif
-#ifdef _SC_STREAM_MAX
{ "STREAM_MAX", _SC_STREAM_MAX, SYSCONF },
-#endif
-#ifdef _SC_AIO_LISTIO_MAX
{ "AIO_LISTIO_MAX", _SC_AIO_LISTIO_MAX, SYSCONF },
-#endif
-#ifdef _SC_AIO_MAX
{ "AIO_MAX", _SC_AIO_MAX, SYSCONF },
-#endif
-#ifdef _SC_AIO_PRIO_DELTA_MAX
{ "AIO_PRIO_DELTA_MAX", _SC_AIO_PRIO_DELTA_MAX, SYSCONF },
-#endif
-#ifdef _SC_DELAYTIMER_MAX
{ "DELAYTIMER_MAX", _SC_DELAYTIMER_MAX, SYSCONF },
-#endif
-#ifdef _SC_HOST_NAME_MAX
{ "HOST_NAME_MAX", _SC_HOST_NAME_MAX, SYSCONF },
-#endif
-#ifdef _SC_LOGIN_NAME_MAX
{ "LOGIN_NAME_MAX", _SC_LOGIN_NAME_MAX, SYSCONF },
-#endif
-#ifdef _SC_MQ_OPEN_MAX
{ "MQ_OPEN_MAX", _SC_MQ_OPEN_MAX, SYSCONF },
-#endif
-#ifdef _SC_MQ_PRIO_MAX
{ "MQ_PRIO_MAX", _SC_MQ_PRIO_MAX, SYSCONF },
-#endif
-#ifdef _SC_DEVICE_IO
{ "_POSIX_DEVICE_IO", _SC_DEVICE_IO, SYSCONF },
-#endif
-#ifdef _SC_TRACE
{ "_POSIX_TRACE", _SC_TRACE, SYSCONF },
-#endif
-#ifdef _SC_TRACE_EVENT_FILTER
{ "_POSIX_TRACE_EVENT_FILTER", _SC_TRACE_EVENT_FILTER, SYSCONF },
-#endif
-#ifdef _SC_TRACE_INHERIT
{ "_POSIX_TRACE_INHERIT", _SC_TRACE_INHERIT, SYSCONF },
-#endif
-#ifdef _SC_TRACE_LOG
{ "_POSIX_TRACE_LOG", _SC_TRACE_LOG, SYSCONF },
-#endif
-#ifdef _SC_RTSIG_MAX
{ "RTSIG_MAX", _SC_RTSIG_MAX, SYSCONF },
-#endif
-#ifdef _SC_SEM_NSEMS_MAX
{ "SEM_NSEMS_MAX", _SC_SEM_NSEMS_MAX, SYSCONF },
-#endif
-#ifdef _SC_SEM_VALUE_MAX
{ "SEM_VALUE_MAX", _SC_SEM_VALUE_MAX, SYSCONF },
-#endif
-#ifdef _SC_SIGQUEUE_MAX
{ "SIGQUEUE_MAX", _SC_SIGQUEUE_MAX, SYSCONF },
-#endif
-#ifdef _PC_FILESIZEBITS
{ "FILESIZEBITS", _PC_FILESIZEBITS, PATHCONF },
-#endif
-#ifdef _PC_ALLOC_SIZE_MIN
{ "POSIX_ALLOC_SIZE_MIN", _PC_ALLOC_SIZE_MIN, PATHCONF },
-#endif
-#ifdef _PC_REC_INCR_XFER_SIZE
{ "POSIX_REC_INCR_XFER_SIZE", _PC_REC_INCR_XFER_SIZE, PATHCONF },
-#endif
-#ifdef _PC_REC_MAX_XFER_SIZE
{ "POSIX_REC_MAX_XFER_SIZE", _PC_REC_MAX_XFER_SIZE, PATHCONF },
-#endif
-#ifdef _PC_REC_MIN_XFER_SIZE
{ "POSIX_REC_MIN_XFER_SIZE", _PC_REC_MIN_XFER_SIZE, PATHCONF },
-#endif
-#ifdef _PC_REC_XFER_ALIGN
{ "POSIX_REC_XFER_ALIGN", _PC_REC_XFER_ALIGN, PATHCONF },
-#endif
-#ifdef _PC_SYMLINK_MAX
{ "SYMLINK_MAX", _PC_SYMLINK_MAX, PATHCONF },
-#endif
-#ifdef _CS_GNU_LIBC_VERSION
{ "GNU_LIBC_VERSION", _CS_GNU_LIBC_VERSION, CONFSTR },
-#endif
-#ifdef _CS_GNU_LIBPTHREAD_VERSION
{ "GNU_LIBPTHREAD_VERSION", _CS_GNU_LIBPTHREAD_VERSION, CONFSTR },
-#endif
-#ifdef _PC_2_SYMLINKS
{ "POSIX2_SYMLINKS", _PC_2_SYMLINKS, PATHCONF },
-#endif
-#ifdef _SC_LEVEL1_ICACHE_SIZE
{ "LEVEL1_ICACHE_SIZE", _SC_LEVEL1_ICACHE_SIZE, SYSCONF },
-#endif
-#ifdef _SC_LEVEL1_ICACHE_ASSOC
{ "LEVEL1_ICACHE_ASSOC", _SC_LEVEL1_ICACHE_ASSOC, SYSCONF },
-#endif
-#ifdef _SC_LEVEL1_ICACHE_LINESIZE
{ "LEVEL1_ICACHE_LINESIZE", _SC_LEVEL1_ICACHE_LINESIZE, SYSCONF },
-#endif
-#ifdef _SC_LEVEL1_DCACHE_SIZE
{ "LEVEL1_DCACHE_SIZE", _SC_LEVEL1_DCACHE_SIZE, SYSCONF },
-#endif
-#ifdef _SC_LEVEL1_DCACHE_ASSOC
{ "LEVEL1_DCACHE_ASSOC", _SC_LEVEL1_DCACHE_ASSOC, SYSCONF },
-#endif
-#ifdef _SC_LEVEL1_DCACHE_LINESIZE
{ "LEVEL1_DCACHE_LINESIZE", _SC_LEVEL1_DCACHE_LINESIZE, SYSCONF },
-#endif
-#ifdef _SC_LEVEL2_CACHE_SIZE
{ "LEVEL2_CACHE_SIZE", _SC_LEVEL2_CACHE_SIZE, SYSCONF },
-#endif
-#ifdef _SC_LEVEL2_CACHE_ASSOC
{ "LEVEL2_CACHE_ASSOC", _SC_LEVEL2_CACHE_ASSOC, SYSCONF },
-#endif
-#ifdef _SC_LEVEL2_CACHE_LINESIZE
{ "LEVEL2_CACHE_LINESIZE", _SC_LEVEL2_CACHE_LINESIZE, SYSCONF },
-#endif
-#ifdef _SC_LEVEL3_CACHE_SIZE
{ "LEVEL3_CACHE_SIZE", _SC_LEVEL3_CACHE_SIZE, SYSCONF },
-#endif
-#ifdef _SC_LEVEL3_CACHE_ASSOC
{ "LEVEL3_CACHE_ASSOC", _SC_LEVEL3_CACHE_ASSOC, SYSCONF },
-#endif
-#ifdef _SC_LEVEL3_CACHE_LINESIZE
{ "LEVEL3_CACHE_LINESIZE", _SC_LEVEL3_CACHE_LINESIZE, SYSCONF },
-#endif
-#ifdef _SC_LEVEL4_CACHE_SIZE
{ "LEVEL4_CACHE_SIZE", _SC_LEVEL4_CACHE_SIZE, SYSCONF },
-#endif
-#ifdef _SC_LEVEL4_CACHE_ASSOC
{ "LEVEL4_CACHE_ASSOC", _SC_LEVEL4_CACHE_ASSOC, SYSCONF },
-#endif
-#ifdef _SC_LEVEL4_CACHE_LINESIZE
{ "LEVEL4_CACHE_LINESIZE", _SC_LEVEL4_CACHE_LINESIZE, SYSCONF },
-#endif
-#ifdef _SC_IPV6
{ "IPV6", _SC_IPV6, SYSCONF },
-#endif
-#ifdef _SC_RAW_SOCKETS
{ "RAW_SOCKETS", _SC_RAW_SOCKETS, SYSCONF },
-#endif
-#ifdef _SC_IPV6
{ "_POSIX_IPV6", _SC_IPV6, SYSCONF },
-#endif
-#ifdef _SC_RAW_SOCKETS
{ "_POSIX_RAW_SOCKETS", _SC_RAW_SOCKETS, SYSCONF },
-#endif
{ NULL, 0, SYSCONF }
};
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=602f80ec8b966cfad3b61914cbe14ee606cedf6e
commit 602f80ec8b966cfad3b61914cbe14ee606cedf6e
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Tue Sep 16 22:16:01 2014 +0530
Make __extern_always_inline usable on clang++ again
The fix for BZ #17266 (884ddc5081278f488ef8cd49951f41cfdbb480ce)
removed changes that had gone into cdefs.h to make
__extern_always_inline usable with clang++. This patch adds back
support for clang to detect if GNU inlining semantics are available,
this time without breaking the gcc use case. The check put here is
based on the earlier patch and assertion[1] that checking if
__GNUC_STDC_INLINE__ or __GNUC_GNU_INLINE__ is defined is sufficient
to determine that clang++ suports GNU inlining semantics.
Tested with a simple program that builds with __extern_always_inline
with the patch and fails compilation without it.
#include <stdio.h>
#include <sys/cdefs.h>
extern void foo_alias (void) __asm ("foo");
__extern_always_inline void
foo (void)
{
puts ("hi oh world!");
return foo_alias ();
}
void
foo_alias (void)
{
puts ("hell oh world");
}
int
main ()
{
foo ();
}
[1] https://sourceware.org/ml/libc-alpha/2012-12/msg00306.html
[BZ #17266]
* misc/sys/cdefs.h: Define __extern_always_inline for clang
4.2 and newer.
diff --git a/ChangeLog b/ChangeLog
index d5fd959..436b3df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-09-16 Siddhesh Poyarekar <siddhesh@redhat.com>
+ [BZ #17266]
+ * misc/sys/cdefs.h: Define __extern_always_inline for clang
+ 4.2 and newer.
+
[BZ #17370]
* libio/wfileops.c (do_ftell_wide): Free OUT on error path.
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
index 01e81ba..711ac1d 100644
--- a/misc/sys/cdefs.h
+++ b/misc/sys/cdefs.h
@@ -321,8 +321,14 @@
inline semantics, unless -fgnu89-inline is used. Using __GNUC_STDC_INLINE__
or __GNUC_GNU_INLINE is not a good enough check for gcc because gcc versions
older than 4.3 may define these macros and still not guarantee GNU inlining
- semantics. */
-#if !defined __cplusplus || __GNUC_PREREQ (4,3)
+ semantics.
+
+ clang++ identifies itself as gcc-4.2, but has support for GNU inlining
+ semantics, that can be checked fot by using the __GNUC_STDC_INLINE_ and
+ __GNUC_GNU_INLINE__ macro definitions. */
+#if (!defined __cplusplus || __GNUC_PREREQ (4,3) \
+ || (defined __clang__ && (defined __GNUC_STDC_INLINE__ \
+ || defined __GNUC_GNU_INLINE__)))
# if defined __GNUC_STDC_INLINE__ || defined __cplusplus
# define __extern_inline extern __inline __attribute__ ((__gnu_inline__))
# define __extern_always_inline \
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 17 ++
Makerules | 2 +-
dlfcn/eval.c | 200 -----------------
elf/Makefile | 14 +-
elf/interp.c | 2 +
misc/sys/cdefs.h | 10 +-
posix/getconf.c | 628 ------------------------------------------------------
7 files changed, 38 insertions(+), 835 deletions(-)
delete mode 100644 dlfcn/eval.c
hooks/post-receive
--
GNU C Library master sources