From patchwork Fri May 16 18:25:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 977 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx22.g.dreamhost.com (mx2.sub5.homie.mail.dreamhost.com [208.113.200.128]) by wilcox.dreamhost.com (Postfix) with ESMTP id 79AAE360098 for ; Fri, 16 May 2014 11:25:48 -0700 (PDT) Received: by homiemail-mx22.g.dreamhost.com (Postfix, from userid 14307373) id 27FF559EED8C; Fri, 16 May 2014 11:25:47 -0700 (PDT) X-Original-To: glibc@patchwork.siddhesh.in Delivered-To: x14307373@homiemail-mx22.g.dreamhost.com 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 homiemail-mx22.g.dreamhost.com (Postfix) with ESMTPS id A9EFB5AA6119 for ; Fri, 16 May 2014 11:25:47 -0700 (PDT) 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:cc:subject:in-reply-to :references:message-id:date; q=dns; s=default; b=iaQCqs4Y3KIrF6A uOMEJEjtXb1N4j7+cwDKXLAJgi6LerEfnIq4jWlQmZeGZleyEt4MIgBrbN3BY5QC 2GnXErNptg78Yk0hhYHYQ+v1wA7HD3X3Hy3KVbUifaz2OKINEDFYwF+ZJwz62Akx AhvR0OH5MWQo8HDjs67CQ3NfUEuI= 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:cc:subject:in-reply-to :references:message-id:date; s=default; bh=Y2n22xen4cslUvGMz5NiA yG8ZTU=; b=IZhxPPrxkzr++xywf66CKA7cF49qHMnZorSE8BCtFlL7gUno5B56M 81p/4F+XLxJIqHpUPhDFmFJmIuYz/iWsBlBSbsL3dKRdzBkyj8PWmvAKrih5x/zB UyGZAn6/B+mN5sxTkKrpqd8kK2942q3GsNk6VVbs5yk145NvgYeDQs= Received: (qmail 27956 invoked by alias); 16 May 2014 18:25:45 -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 27944 invoked by uid 89); 16 May 2014 18:25:45 -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: Steve Ellcey Cc: "GNU C. Library" Subject: Re: [COMMITTED PATCH] Fix powerpc fork after i386 reorganization. In-Reply-To: Steve Ellcey's message of Friday, 16 May 2014 08:09:02 -0700 <1400252942.30618.8.camel@ubuntu-sellcey> References: <1400252942.30618.8.camel@ubuntu-sellcey> Message-Id: <20140516182541.5F4852C3A49@topped-with-meat.com> Date: Fri, 16 May 2014 11:25:41 -0700 (PDT) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=HrjlRSjS c=1 sm=1 tr=0 a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=uR0vgfoRIhAA:10 a=Z6MIti7PxpgA:10 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=mDV3o1hIAAAA:8 a=CuUqPvEtvE0KINs_wzMA:9 a=CjuIK1q_8ugA:10 X-DH-Original-To: glibc@patchwork.siddhesh.in > It looks like you changed this for MIPS but my build is still failing: I was afraid that might happen, though I hadn't thought of it when I was making the changes. #include_next is too subtle. I've committed the following and tested it still works on x86_64 and i686. It should fix the mips and powerpc builds. Please verify that it does. Thanks, Roland 2014-05-16 Roland McGrath * sysdeps/unix/sysv/linux/i386/fork.h: Moved ... * sysdeps/unix/sysv/linux/i386/arch-fork.h: ... here. Don't do #include_next. * sysdeps/unix/sysv/linux/x86_64/fork.h: Moved ... * sysdeps/unix/sysv/linux/x86_64/arch-fork.h: ... here. Don't do #include_next. * sysdeps/unix/sysv/linux/mips/arch-fork.h: New file. * sysdeps/unix/sysv/linux/mips/fork.h: File removed. * sysdeps/unix/sysv/linux/powerpc/arch-fork.h: New file. * sysdeps/unix/sysv/linux/powerpc/fork.h: File removed. --- a/nptl/sysdeps/unix/sysv/linux/fork.c +++ b/nptl/sysdeps/unix/sysv/linux/fork.c @@ -29,6 +29,7 @@ #include #include #include +#include unsigned long int *__fork_generation_pointer; --- a/sysdeps/unix/sysv/linux/i386/fork.h +++ b/sysdeps/unix/sysv/linux/i386/arch-fork.h @@ -18,10 +18,10 @@ . */ #include +#include +#include #define ARCH_FORK() \ INLINE_SYSCALL (clone, 5, \ CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD, 0, \ NULL, NULL, &THREAD_SELF->tid) - -#include_next --- /dev/null +++ b/sysdeps/unix/sysv/linux/mips/arch-fork.h @@ -0,0 +1 @@ +#include --- a/sysdeps/unix/sysv/linux/mips/fork.h +++ /dev/null @@ -1 +0,0 @@ -#include --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/arch-fork.h @@ -0,0 +1 @@ +#include --- a/sysdeps/unix/sysv/linux/powerpc/fork.h +++ /dev/null @@ -1 +0,0 @@ -#include --- a/sysdeps/unix/sysv/linux/x86_64/fork.h +++ b/sysdeps/unix/sysv/linux/x86_64/arch-fork.h @@ -18,10 +18,10 @@ . */ #include +#include +#include #define ARCH_FORK() \ INLINE_SYSCALL (clone, 4, \ CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD, 0, \ NULL, &THREAD_SELF->tid) - -#include_next