about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@redhat.com>2014-09-04 00:39:50 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2014-12-15 11:03:33 +0530
commit67cf3c6ed0b1119bbddc1c6f46af486fc1ad2432 (patch)
treecfc48ba95ee11abe6141739a278c0314ab68743f
parent6644e37a1da5c8745d69fccaa3073c072827dfd4 (diff)
downloadglibc-67cf3c6ed0b1119bbddc1c6f46af486fc1ad2432.tar.gz
glibc-67cf3c6ed0b1119bbddc1c6f46af486fc1ad2432.tar.xz
glibc-67cf3c6ed0b1119bbddc1c6f46af486fc1ad2432.zip
Use PTHREAD_DESTRUCTOR_ITERATIONS
The _POSIX_THREAD_DESTRUCTOR_ITERATIONS variable is not implemented by
getconf, so to get both getconf and sysconf on the same page, make the
latter use PTHREAD_DESTRUCTOR_ITERATIONS.

The generated code is unchanged on x86_64.

Siddhesh

	* posix/conf.list (SYSCONF:POSIX): Remove
	THREAD_DESTRUCTOR_ITERATIONS.
	* sysdeps/posix/sysconf.c (__sysconf): Use
	PTHREAD_DESTRUCTOR_ITERATIONS.
-rw-r--r--posix/conf.list1
-rw-r--r--sysdeps/posix/sysconf.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/posix/conf.list b/posix/conf.list
index 8e947f4db8..000b90893a 100644
--- a/posix/conf.list
+++ b/posix/conf.list
@@ -99,7 +99,6 @@ SYSCONF:POSIX {
   USER_GROUPS_R
   VERSION
 # Additional variables not in getconf.
-  THREAD_DESTRUCTOR_ITERATIONS
   IPV6
   RAW_SOCKETS
 }
diff --git a/sysdeps/posix/sysconf.c b/sysdeps/posix/sysconf.c
index f5b65bf149..c7b748b171 100644
--- a/sysdeps/posix/sysconf.c
+++ b/sysdeps/posix/sysconf.c
@@ -555,8 +555,8 @@ __sysconf (name)
 #endif
 
     case _SC_THREAD_DESTRUCTOR_ITERATIONS:
-#if CONF_IS_DEFINED_SET (_POSIX_THREAD_DESTRUCTOR_ITERATIONS)
-      return _POSIX_THREAD_DESTRUCTOR_ITERATIONS;
+#if PTHREAD_DESTRUCTOR_ITERATIONS
+      return PTHREAD_DESTRUCTOR_ITERATIONS;
 #else
       return -1;
 #endif