From patchwork Tue May 27 22:33:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 353181 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 0D01114008A for ; Wed, 28 May 2014 08:33:11 +1000 (EST) 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=Nnu9ncF1gvc6QTLV2xcNUCTFzyouzg8YRrhT+Q4mRvJI2n Aid/IJ2SXpRyLRjKDDtzZ/bxbnjWJ6ybrLb9AhIE/RxCTudfB2OztO1sIDEBcioq ugv9FX1BiBv3cw35Vsbn1GBbtcCcqEXCOSjgPpmoPkzT+CG1aoMybN9O2vTwE= 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=yl4z5Xvc2fmgDKP48FjtYj+qC98=; b=kz/lPZnnzMRAWz6j4gWP 81oja4ci8bHL3wTeMbm5ahuxcdX/NasM4nc3Th+tuURFlUodTMQ/qMOnlK7i4vYQ GAiRHU6G7RZ1CcFPRwKF+ec7g313jTUCU/HG+tiI/uihBnE3TTOVenZb6WbqFTTm seH83PFydZU3YvrIh0SfJVQ= Received: (qmail 7618 invoked by alias); 27 May 2014 22:33:07 -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 7608 invoked by uid 89); 27 May 2014 22:33:06 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 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: [PATCH roland/nptl-hppa] HPPA: Consolidate NPTL/non versions of clone Message-Id: <20140527223303.987A82C3B26@topped-with-meat.com> Date: Tue, 27 May 2014 15:33:03 -0700 (PDT) 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=BDrZP-1f3i0A:10 a=Z6MIti7PxpgA:10 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=YhbJS_KvS3Whe0xbeEQA:9 a=CjuIK1q_8ugA:10 I haven't tried to compile this or anything. Please verify it results in no code change. Thanks, Roland * sysdeps/unix/sysv/linux/hppa/clone.S: Include . Deconditionalize the code that was previously under [RESET_PID]. * sysdeps/unix/sysv/linux/hppa/nptl/clone.S: File removed. --- a/sysdeps/unix/sysv/linux/hppa/clone.S +++ b/sysdeps/unix/sysv/linux/hppa/clone.S @@ -24,6 +24,7 @@ #include #define _ERRNO_H 1 #include +#include /* Non-thread code calls __clone with the following parameters: int clone(int (*fn)(void *arg), @@ -131,9 +132,8 @@ ENTRY(__clone) ldwm -64(%sp), %r4 .LthreadStart: -#ifdef RESET_PID -# define CLONE_VM_BIT 23 /* 0x00000100 */ -# define CLONE_THREAD_BIT 15 /* 0x00010000 */ +#define CLONE_VM_BIT 23 /* 0x00000100 */ +#define CLONE_THREAD_BIT 15 /* 0x00010000 */ /* Load original clone flags. If CLONE_THREAD was passed, don't reset the PID/TID. If CLONE_VM was passed, we need to store -1 to PID/TID. @@ -150,7 +150,6 @@ ENTRY(__clone) stw %ret0, PID_THREAD_OFFSET(%r26) stw %ret0, TID_THREAD_OFFSET(%r26) 1: -#endif /* Load up the arguments. */ ldw -60(%sp), %arg0 ldw -64(%sp), %r22 --- a/sysdeps/unix/sysv/linux/hppa/nptl/clone.S +++ /dev/null @@ -1,3 +0,0 @@ -#define RESET_PID -#include -#include "../clone.S"