From patchwork Fri May 9 23:01:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 347571 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 0DF8714007F for ; Sat, 10 May 2014 09:01:13 +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=BnbxnW39CMCnBWjkoKcbXm0kdtzmAn0IGqi2ugKy7vSdMd WFSZ8zOQezljCa9NOZqOZQIyEfDDAEMR/2ajyv/X7rmbdKiU8K8V3dAKllNNPObT uZjGrphSQl5f1zb0Uokd7vvycDvUpMyj1ZSD809u3yuHRncDmSGtm2P7VFzbs= 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=vTx5tlY4lerszVncuuSuHDn5UmU=; b=MMIhJ5wTMMhJe13qpzBq rUHmz5FcpEnVRuYUz6AqZEsVNKx0yCYPw36G0NbVEHt19BReh8uzbQHtnfkk82rw 5EIZkQtfMbZ7WUYXSrjBjSWk3sPlqxZCG6r6ms1Pklvj8i07UO9JT+AdgY7jwadz pxVN5bGNgebHyxPzJ2eyftU= Received: (qmail 18324 invoked by alias); 9 May 2014 23:01:08 -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 18315 invoked by uid 89); 9 May 2014 23:01:08 -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 1/3 roland/nptl] Consolidate NPTL vs non clone.S for ARM. Message-Id: <20140509230105.080972C39FE@topped-with-meat.com> Date: Fri, 9 May 2014 16:01:04 -0700 (PDT) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=J405smXS c=1 sm=1 tr=0 a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=jbVK4oucufcA:10 a=Z6MIti7PxpgA:10 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=dMOHTmRuURnET5a96toA:9 a=CjuIK1q_8ugA:10 * sysdeps/unix/sysv/linux/arm/clone.S: Include . Deconditionalize the code that was previously under [RESET_PID]. * sysdeps/unix/sysv/linux/arm/nptl/clone.S: File removed. --- a/sysdeps/unix/sysv/linux/arm/clone.S +++ b/sysdeps/unix/sysv/linux/arm/clone.S @@ -20,6 +20,7 @@ and invokes a function in the right context after its all over. */ #include +#include #define _ERRNO_H 1 #include @@ -45,9 +46,7 @@ ENTRY(__clone) @ do the system call @ get flags mov r0, r2 -#ifdef RESET_PID mov ip, r2 -#endif @ new sp is already in r1 push {r4, r7} cfi_adjust_cfa_offset (8) @@ -71,7 +70,6 @@ PSEUDO_END (__clone) 1: .fnstart .cantunwind -#ifdef RESET_PID tst ip, #CLONE_THREAD bne 3f GET_TLS (lr) @@ -85,7 +83,6 @@ PSEUDO_END (__clone) str r0, NEGOFF_OFF1 (r1, TID_OFFSET) str r0, NEGOFF_OFF2 (r1, PID_OFFSET, TID_OFFSET) 3: -#endif @ pick the function arg and call address off the stack and execute ldr r0, [sp, #4] ldr ip, [sp], #8 --- a/sysdeps/unix/sysv/linux/arm/nptl/clone.S +++ /dev/null @@ -1,3 +0,0 @@ -#define RESET_PID -#include -#include "../clone.S"