From patchwork Thu Jan 8 21:41:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 426864 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B5D8A140146 for ; Fri, 9 Jan 2015 08:42:05 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; q= dns; s=default; b=SQrzkJMfZFDhJ9oVSS0scGDeqj36SFx6HulyHtkZ6Bwfhv IvoUnzHvBy2kciJR9y9I8vludizxCiVcsfyzGSfpLq4iMKF3/N+lLD9zWuaD2QjV +sWQ/F8hRAOai2OH5XoihYoYIKb7vey0fkaYG20qclcRoIYF9dLEQuDLsg2j4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; s= default; bh=fpWcw0+C0RrmjhNJdh3UgDdPdqM=; b=QAT2SfDRNWvDoKG0ZjGK XpeBYmDFnBiGnu0ykqjKmbUXRhG+O093IigU0m1fohSZ3KrXcwoG6F5JQI0wjsyf dOrXSc3b8BbOVjPgCxVoAv8Rr/Ep0hRsHBURWvHxYD6eRrF40RnaZ3aYm5EmDC7D 8VCCXR/RkdIDc4jttkstlGI= Received: (qmail 8269 invoked by alias); 8 Jan 2015 21:41:59 -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 8260 invoked by uid 89); 8 Jan 2015 21:41:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: topped-with-meat.com MIME-Version: 1.0 From: Roland McGrath To: "GNU C. Library" Subject: [COMMITTED PATCH] NPTL: Fixed missed conditionalization of setxid hooey. Message-Id: <20150108214156.5AA8B2C3BA1@topped-with-meat.com> Date: Thu, 8 Jan 2015 13:41:56 -0800 (PST) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=SvUDtp+0 c=1 sm=1 tr=0 a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=MoE0Q2kJeLP0YylN5qwA:9 a=CjuIK1q_8ugA:10 Verified on x86_64-linux-gnu that no generated code changes. Thanks, Roland * nptl/nptl-init.c (pthread_functions): Conditionalize .ptr__nptl_setxid initialization on [SIGSETXID]. --- a/nptl/nptl-init.c +++ b/nptl/nptl-init.c @@ -140,7 +140,9 @@ static const struct pthread_functions pthread_functions = .ptr_nthreads = &__nptl_nthreads, .ptr___pthread_unwind = &__pthread_unwind, .ptr__nptl_deallocate_tsd = __nptl_deallocate_tsd, +# ifdef SIGSETXID .ptr__nptl_setxid = __nptl_setxid, +# endif /* For now only the stack cache needs to be freed. */ .ptr_freeres = nptl_freeres, .ptr_set_robust = __nptl_set_robust