From patchwork Mon Jun 23 18:03:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 363078 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 24E6B14008B for ; Tue, 24 Jun 2014 04:03:31 +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=d4qZs7s68Y1reRYiFNx4aMtIhfTtUFXXP8XBEyBFzMZSkS EEW4eB3llWfsl3Tpn+BP64P7pAVSLemqtpGlVvYRbCr330AZgjkKWQ0Xr8cwdzbx +GW8Djuroz3TCFJw+ks2/KDNuSSkxqk/+ymbb4egeDqHBpmKzWNaLZYDP4d4U= 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=juFUt29ua3e6E8msFaau4EHg8KU=; b=vI3U5QunKJGPk49rH169 VEJzCcT32u+iXFVnNhB8RSOgBA5CifGRV/kL6xkfyyww8uo+BKVsY9awcPmHZl7t kIQMfSoU4e1XNPI5z5zAyse+S0Rf88/YwwC4JS4Kf1m0yMOX8HHi549kNmxrh2Xa voXrzHqEl7wXGI9YtFOSjhw= Received: (qmail 21250 invoked by alias); 23 Jun 2014 18:03:25 -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 21217 invoked by uid 89); 23 Jun 2014 18:03:22 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 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-s390] S390: Consolidate NPTL/non versions of clone Message-Id: <20140623180318.00BC22C3A03@topped-with-meat.com> Date: Mon, 23 Jun 2014 11:03:17 -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=YmPsB1GbjQAA:10 a=Z6MIti7PxpgA:10 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=5yldfkUcMBjGhucP93IA:9 a=CjuIK1q_8ugA:10 Not tested at all, but this should not change anything. OK? Thanks, Roland 2014-06-23 Roland McGrath * sysdeps/unix/sysv/linux/s390/s390-32/clone.S: Deconditionalize the code that was previously under [RESET_PID]. * sysdeps/unix/sysv/linux/s390/s390-64/clone.S: Likewise. * nptl/sysdeps/unix/sysv/linux/s390/s390-32/clone.S: File removed. * nptl/sysdeps/unix/sysv/linux/s390/s390-64/clone.S: File removed. diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/clone.S b/nptl/sysdeps/unix/sysv/linux/s390/s390-32/clone.S deleted file mode 100644 index 675a997..0000000 --- a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/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 diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/clone.S b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/clone.S deleted file mode 100644 index 675a997..0000000 --- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/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 diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/clone.S b/sysdeps/unix/sysv/linux/s390/s390-32/clone.S index f26c229..a5e1980 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/clone.S +++ b/sysdeps/unix/sysv/linux/s390/s390-32/clone.S @@ -54,7 +54,6 @@ error: PSEUDO_END (__clone) thread_start: -#ifdef RESET_PID tmh %r3,1 /* CLONE_THREAD == 0x00010000 */ jne 1f lhi %r2,-1 @@ -65,7 +64,6 @@ thread_start: st %r2,PID(%r3) st %r2,TID(%r3) 1: -#endif /* fn is in gpr 1, arg in gpr 0 */ lr %r2,%r0 /* set first parameter to void *arg */ ahi %r15,-96 /* make room on the stack for the save area */ diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/clone.S b/sysdeps/unix/sysv/linux/s390/s390-64/clone.S index ee501b5..27ddf1f 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/clone.S +++ b/sysdeps/unix/sysv/linux/s390/s390-64/clone.S @@ -55,7 +55,6 @@ error: PSEUDO_END (__clone) thread_start: -#ifdef RESET_PID tmh %r3,1 /* CLONE_THREAD == 0x00010000 */ jne 1f lhi %r2,-1 @@ -68,7 +67,6 @@ thread_start: st %r2,PID(%r3) st %r2,TID(%r3) 1: -#endif /* fn is in gpr 1, arg in gpr 0 */ lgr %r2,%r0 /* set first parameter to void *arg */ aghi %r15,-160 /* make room on the stack for the save area */