From patchwork Tue May 27 22:28:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 353179 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 4F9111400DB for ; Wed, 28 May 2014 08:28:58 +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=iTVrV6X6L0y5CQEas9yn8qkS0L2vcBA66tXCCO7NBC1uJt rmPTIYmDg0uMNpj1mcaaTPlhAuDWHkCkjdW3Zgf4ZbwoZ1WIqfNhLx0QfUJzHrYJ NOXZo6z7F9rAjNuTCg3MN6jnXMmf/UFwd8h96WxkDL8gnZEgn3UPN/GhEtKrs= 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=zIPVV6aKgxDBYhogpdO7hb7VWBQ=; b=rvt9lfatvn5MKpia+hWF HLBhstbo5vC9+SQw80LWS9bp/CN3Xs7YahWmLNK/i1KVaJl04uOnhRUZufoGR+gY nMzEhjovqDBGgce+dTmOAKauhZF84Ct+jC636wAF7oP+HcyAhZNMJjaAmVVqXYDi fh7MVA5UJSrmMwdp18axQh8= Received: (qmail 4936 invoked by alias); 27 May 2014 22:28:51 -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 4924 invoked by uid 89); 27 May 2014 22:28:50 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.5 required=5.0 tests=AWL, BAYES_00, KAM_STOCKGEN autolearn=no 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-sh] SH: Consolidate NPTL/non versions of clone Message-Id: <20140527222846.CDEED2C3B26@topped-with-meat.com> Date: Tue, 27 May 2014 15:28:46 -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=29mdIY2FDLMA:10 a=Z6MIti7PxpgA:10 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=VLLDCIwRKR-_tdqkTAUA: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/sh/clone.S: Deconditionalize the code that was previously under [RESET_PID]. * nptl/sysdeps/unix/sysv/linux/sh/clone.S: File removed. --- a/nptl/sysdeps/unix/sysv/linux/sh/clone.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 --- a/sysdeps/unix/sysv/linux/sh/clone.S +++ b/sysdeps/unix/sysv/linux/sh/clone.S @@ -21,9 +21,8 @@ #include #define _ERRNO_H 1 #include -#ifdef RESET_PID #include -#endif + /* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg, pid_t *ptid, void *tls, pid_t *ctid); */ @@ -67,7 +66,6 @@ ENTRY(__clone) 2: /* terminate the stack frame */ mov #0, r14 -#ifdef RESET_PID mov r4, r0 shlr16 r0 tst #1, r0 // CLONE_THREAD = (1 << 16) @@ -89,7 +87,6 @@ ENTRY(__clone) add r1, r2 mov.l r0, @r2 4: -#endif /* thread starts */ mov.l @r15, r1 jsr @r1 @@ -120,12 +117,10 @@ ENTRY(__clone) .long _GLOBAL_OFFSET_TABLE_ .L3: .long PLTJMP(C_SYMBOL_NAME(_exit)) -#ifdef RESET_PID .Lpidoff: .word PID - TLS_PRE_TCB_SIZE .Ltidoff: .word TID - TLS_PRE_TCB_SIZE -#endif PSEUDO_END (__clone) weak_alias (__clone, clone)