Message ID | 20140516210218.8081E2C3A81@topped-with-meat.com |
---|---|
State | Committed |
Headers |
Return-Path: <x14307373@homiemail-mx22.g.dreamhost.com> 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 BC8CD36007A for <siddhesh@wilcox.dreamhost.com>; Fri, 16 May 2014 14:02:24 -0700 (PDT) Received: by homiemail-mx22.g.dreamhost.com (Postfix, from userid 14307373) id 516C85AC2C4F; Fri, 16 May 2014 14:02:24 -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 23A0E5AC2C61 for <glibc@patchwork.siddhesh.in>; Fri, 16 May 2014 14:02:24 -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=sPLz4yabrlx/QTj ZT0F5oflRRDaTSLSgbU+Lc8A+vJblrskI/rs0T04cl0x4f3igNRG3KqEhTq8gAe6 C0ePArjMhBOKupTtDMFOS0X84dLUCKCRx0wOAN3OuqZUKXIyg8eMHlF1v++99veI Y73shBASY8WQB/Pmnon8NyRWac2c= 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=tTg/YIrHRZ8OA86iKWPGO V1vVTE=; b=pd7vaeEtnif2f1kwvvWLffrrJzJ0DLR+/W0pjK1P7HB4yBdPOTEOR 0zDsiFNF/M55MIV7E5HE3wnxwFpFW8o2gLO+nVCJ8EYaRZYuFtbJJSUyWdLEwaNB G5cmv7Qk0RYDzhj9Umz2Vz74s2huQUWWVW6ZdRxV6ZJg1s/p5usa3E= Received: (qmail 18955 invoked by alias); 16 May 2014 21:02:22 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: <libc-alpha.sourceware.org> List-Unsubscribe: <mailto:libc-alpha-unsubscribe-glibc=patchwork.siddhesh.in@sourceware.org> List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org> List-Archive: <http://sourceware.org/ml/libc-alpha/> List-Post: <mailto:libc-alpha@sourceware.org> List-Help: <mailto:libc-alpha-help@sourceware.org>, <http://sourceware.org/ml/#faqs> Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 18935 invoked by uid 89); 16 May 2014 21:02:21 -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 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit From: Roland McGrath <roland@hack.frob.com> To: Steve Ellcey <sellcey@mips.com> Cc: "GNU C. Library" <libc-alpha@sourceware.org> Subject: [PATCH roland/waitpid] Fix __waitpid_nocancel link error In-Reply-To: Steve Ellcey's message of Friday, 16 May 2014 13:38:31 -0700 <1400272711.30618.15.camel@ubuntu-sellcey> References: <Pine.LNX.4.64.1405142105400.21615@digraph.polyomino.org.uk> <1400252942.30618.8.camel@ubuntu-sellcey> <20140516182541.5F4852C3A49@topped-with-meat.com> <1400272711.30618.15.camel@ubuntu-sellcey> Message-Id: <20140516210218.8081E2C3A81@topped-with-meat.com> Date: Fri, 16 May 2014 14:02:18 -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=OKhEQJ6HDdoA:10 a=Z6MIti7PxpgA:10 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=F-_4UYs1qrDmQxnwaSwA:9 a=CjuIK1q_8ugA:10 X-DH-Original-To: glibc@patchwork.siddhesh.in |
Commit Message
Roland McGrath
May 16, 2014, 9:02 p.m. UTC
> Well, I am not getting that error anymore but now my MIPS build dies > while linking libc.so: > > /local/home/sellcey/nightly/obj-mips-mti-linux-gnu/glibc/obj_default/libc_pic.os: In function `_IO_new_proc_close': > /local/home/sellcey/nightly/src/glibc/libio/iopopen.c:347: undefined reference to `__waitpid_nocancel' > /local/home/sellcey/nightly/src/glibc/libio/iopopen.c:345: undefined reference to `__waitpid_nocancel' > /local/home/sellcey/nightly/install-mips-mti-linux-gnu/lib/gcc/mips-mti-linux-gnu/4.10.0/../../../../mips-mti-linux-gnu/bin/ld: /local/home/sellcey/nightly/obj-mips-mti-linux-gnu/glibc/obj_default/libc.so: hidden symbol `__waitpid_nocancel' isn't defined > /local/home/sellcey/nightly/install-mips-mti-linux-gnu/lib/gcc/mips-mti-linux-gnu/4.10.0/../../../../mips-mti-linux-gnu/bin/ld: final link failed: Bad value > collect2: error: ld returned 1 exit status This is unrelated to fork. It is due to my not-cancel.h change. I think the following patch will fix it. Can you verify that? (You can just use 'git checkout roland/waitpid' if you are otherwise using unmodified trunk.) Thanks, Roland * sysdeps/unix/sysv/linux/not-cancel.h (waitpid_not_cancel): Use wait4 regardless of [__NR_waitpid].
Comments
On Fri, 2014-05-16 at 14:02 -0700, Roland McGrath wrote: > > This is unrelated to fork. It is due to my not-cancel.h change. > I think the following patch will fix it. Can you verify that? > (You can just use 'git checkout roland/waitpid' if you are otherwise > using unmodified trunk.) > > > Thanks, > Roland > > > * sysdeps/unix/sysv/linux/not-cancel.h (waitpid_not_cancel): > Use wait4 regardless of [__NR_waitpid]. > > --- a/sysdeps/unix/sysv/linux/not-cancel.h > +++ b/sysdeps/unix/sysv/linux/not-cancel.h > @@ -83,13 +83,8 @@ extern int __openat64_nocancel (int fd, const char *fname, int oflag, > __fcntl_nocancel (fd, cmd, val) > > /* Uncancelable waitpid. */ > -#ifdef __NR_waitpid > -# define waitpid_not_cancel(pid, stat_loc, options) \ > - __waitpid_nocancel (pid, stat_loc, options) > -#else > -# define waitpid_not_cancel(pid, stat_loc, options) \ > +#define waitpid_not_cancel(pid, stat_loc, options) \ > INLINE_SYSCALL (wait4, 4, pid, stat_loc, options, NULL) > -#endif > > /* Uncancelable pause. */ > #define pause_not_cancel() \ I applied this patch and my MIPS build worked. Steve Ellcey sellcey@mips.com
Thanks for the testing. I've put the change in.
--- a/sysdeps/unix/sysv/linux/not-cancel.h +++ b/sysdeps/unix/sysv/linux/not-cancel.h @@ -83,13 +83,8 @@ extern int __openat64_nocancel (int fd, const char *fname, int oflag, __fcntl_nocancel (fd, cmd, val) /* Uncancelable waitpid. */ -#ifdef __NR_waitpid -# define waitpid_not_cancel(pid, stat_loc, options) \ - __waitpid_nocancel (pid, stat_loc, options) -#else -# define waitpid_not_cancel(pid, stat_loc, options) \ +#define waitpid_not_cancel(pid, stat_loc, options) \ INLINE_SYSCALL (wait4, 4, pid, stat_loc, options, NULL) -#endif /* Uncancelable pause. */ #define pause_not_cancel() \