From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Wed, 3 Sep 2014 19:09:50 +0000 (+0530)
Subject: Use PTHREAD_DESTRUCTOR_ITERATIONS
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67cf3c6ed0b1119bbddc1c6f46af486fc1ad2432;p=thirdparty%2Fglibc.git

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.
---

diff --git a/posix/conf.list b/posix/conf.list
index 8e947f4db88..000b90893a5 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 f5b65bf1498..c7b748b171c 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