From patchwork Fri May 23 18:18:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 352004 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 2D87514007C for ; Sat, 24 May 2014 04:19:25 +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:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=w3lOBjGSLD4oZqw1wrKISlfQ4dRZ3Vr i8oQfRrqDO9HcMbNN5IBvif/U4lLsAMsAF6ADtrHywtzfjbKacu0O/why2zcyKuC Ta3hfhYHAY8xDVTrqqDFBCUqh+t08+d498p6CBSfOgmGHTUXMcHOg5J/MjjP+6Bg 23ItGFanDmCM= 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:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=xqFtrBQvni3h0w2reyX4ZYd/8j0=; b=R8/Y4 3ZOGwWk9DsqIbzWNbRLYw5yFr01Ja9e3y7fuOP61y2YzZVBhEE/BrtV2h0mz/Hv+ CAVk4ZtsiSKEzyUflgpLABQwSHaphpHhkoYgP/3HO4AKAs/CqYHX1zSR3yzPrmDr WqmRCa7VllVFJKbkOAfuHzhXBfrVuLaJqRS8TY= Received: (qmail 4747 invoked by alias); 23 May 2014 18:19:10 -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 4718 invoked by uid 89); 23 May 2014 18:19:09 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.3 required=5.0 tests=AWL, BAYES_20, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=no version=3.3.2 X-HELO: mail-qg0-f53.google.com X-Received: by 10.229.72.10 with SMTP id k10mr9589717qcj.2.1400869146475; Fri, 23 May 2014 11:19:06 -0700 (PDT) From: Richard Henderson To: libc-alpha@sourceware.org Subject: [COMMITTED 2/4] alpha: Merge standard and nptl clone.S Date: Fri, 23 May 2014 11:18:31 -0700 Message-Id: <1400869113-11768-2-git-send-email-rth@twiddle.net> In-Reply-To: <1400869113-11768-1-git-send-email-rth@twiddle.net> References: <1400869113-11768-1-git-send-email-rth@twiddle.net> --- ChangeLog | 4 ++++ sysdeps/unix/sysv/linux/alpha/clone.S | 9 +++------ sysdeps/unix/sysv/linux/alpha/nptl/clone.S | 9 --------- 3 files changed, 7 insertions(+), 15 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/alpha/nptl/clone.S diff --git a/ChangeLog b/ChangeLog index 689613e..83b3599 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2014-05-23 Richard Henderson + * sysdeps/unix/sysv/linux/alpha/clone.S: Deconditionalize the code + that was previously under [RESET_PID]. + * sysdeps/unix/sysv/linux/alpha/nptl/clone.S: File removed. + * sysdeps/unix/sysv/linux/alpha/nptl/fork.c: Remove file. 2014-05-23 Joseph Myers diff --git a/sysdeps/unix/sysv/linux/alpha/clone.S b/sysdeps/unix/sysv/linux/alpha/clone.S index c5c3300..f4e2e1c 100644 --- a/sysdeps/unix/sysv/linux/alpha/clone.S +++ b/sysdeps/unix/sysv/linux/alpha/clone.S @@ -57,9 +57,7 @@ __clone: subq a1, 32, a1 stq a0, 0(a1) stq a3, 8(a1) -#ifdef RESET_PID stq a2, 16(a1) -#endif /* The syscall is of the form clone(flags, usp, ptid, ctid, tls). Shift the flags, ptid, ctid, tls arguments into place; the @@ -86,6 +84,7 @@ PSEUDO_END(__clone) its own function so that we can terminate the stack trace with our debug info. */ + .align 4 .ent thread_start cfi_startproc thread_start: @@ -93,14 +92,12 @@ thread_start: cfi_def_cfa_register(fp) cfi_undefined(ra) -#ifdef RESET_PID /* Check and see if we need to reset the PID. */ ldq t0, 16(sp) lda t1, CLONE_THREAD and t0, t1, t2 beq t2, 2f 1: -#endif /* Load up the arguments. */ ldq pv, 0(sp) @@ -120,9 +117,10 @@ thread_start: #endif /* Die horribly. */ + .align 4 halt -#ifdef RESET_PID + .align 4 2: rduniq lda t1, CLONE_VM @@ -136,7 +134,6 @@ thread_start: stl v0, PID_OFFSET(s0) stl v0, TID_OFFSET(s0) br 1b -#endif cfi_endproc .end thread_start diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/clone.S b/sysdeps/unix/sysv/linux/alpha/nptl/clone.S deleted file mode 100644 index 675a997..0000000 --- a/sysdeps/unix/sysv/linux/alpha/nptl/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