From patchwork Tue May 27 22:49: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: 353195 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 A6BDF1400DB for ; Wed, 28 May 2014 08:49: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=MoIjjYn6ACM56VR+s3IzXRRpIkudOEDIYJBtAZ+vvnPobf 7b6iKZqDSZlKt2lsmGsKlc9YAJa9eCc1CZ2wn2E5sPx0ILkAbSMPPNF0vamepZD1 lzgVFIKgUigkGdDJqD7vka+XIveL7ArWg2li4GKEuu5UexMR0Ax8wGJYBt/jU= 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=5NbICtJxZ+BjdrWxxQXPtyJ5VdQ=; b=dHNmh5y3ieQ2Hwe5QuqY nbZn1L/LCdx9/cy8r8NpgLq7CI/Eo7UZsTNEGm5owFHFBpdzdLv/JYgweUHLzNSh Wsnj1h5VMawZ+lCHJ7EuZ+w85OAsQYddi1fffrYGQCnI7MtoWRIqFKvzSLo+wRoY WDW7JOuxZxmSGE8N4Wc/WjA= Received: (qmail 17817 invoked by alias); 27 May 2014 22:49:06 -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 17801 invoked by uid 89); 27 May 2014 22:49: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-ia64] IA64: Consolidate NPTL/non versions of clone Message-Id: <20140527224903.588BB2C3B48@topped-with-meat.com> Date: Tue, 27 May 2014 15:49: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=IpD8RWA4bVMA:10 a=Z6MIti7PxpgA:10 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=jsqGXNpOPqRsV-ZTMQoA: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/ia64/clone2.S: Deconditionalize the code that was previously under [RESET_PID]. * sysdeps/unix/sysv/linux/ia64/nptl/clone2.S: File removed. --- a/sysdeps/unix/sysv/linux/ia64/clone2.S +++ b/sysdeps/unix/sysv/linux/ia64/clone2.S @@ -67,7 +67,6 @@ ENTRY(__clone2) (CHILD) mov loc0=gp (PARENT) ret ;; -#ifdef RESET_PID tbit.nz p6,p0=in3,16 /* CLONE_THREAD */ tbit.z p7,p10=in3,8 /* CLONE_VM */ (p6) br.cond.dptk 1f @@ -82,7 +81,6 @@ ENTRY(__clone2) st4 [r9]=r8 st4 [r10]=r8 ;; -#endif 1: ld8 out1=[in0],8 /* Retrieve code pointer. */ mov out0=in4 /* Pass proper argument to fn */ ;; --- a/sysdeps/unix/sysv/linux/ia64/nptl/clone2.S +++ /dev/null @@ -1,9 +0,0 @@ -/* We want an #include_next, but we are the main source file. - So, #include ourselves and in that incarnation we can use #include_next. */ -#ifndef INCLUDED_SELF -# define INCLUDED_SELF -# include -#else -# define RESET_PID -# include_next -#endif