From patchwork Fri Sep 19 10:20:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 2919 Received: (qmail 14103 invoked by alias); 19 Sep 2014 10:20:18 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 13994 invoked by uid 89); 19 Sep 2014 10:20:17 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.7 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com From: Siddhesh Poyarekar To: libc-alpha@sourceware.org Cc: roland@hack.frob.com Subject: [PATCH 3/4] Use PTHREAD_DESTRUCTOR_ITERATIONS Date: Fri, 19 Sep 2014 15:50:06 +0530 Message-Id: <1411122007-1461-4-git-send-email-siddhesh@redhat.com> In-Reply-To: <1411122007-1461-1-git-send-email-siddhesh@redhat.com> References: <1411122007-1461-1-git-send-email-siddhesh@redhat.com> 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. --- posix/conf.list | 1 - sysdeps/posix/sysconf.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/posix/conf.list b/posix/conf.list index 6c870af..07607b7 100644 --- a/posix/conf.list +++ b/posix/conf.list @@ -100,7 +100,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 f5b65bf..c7b748b 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