| Message ID | 1410816254-24831-1-git-send-email-jrtc27@jrtc27.com |
|---|---|
| State | New, archived |
| Headers |
Received: (qmail 29616 invoked by alias); 15 Sep 2014 21:25:13 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: <gdb-patches.sourceware.org> List-Unsubscribe: <mailto:gdb-patches-unsubscribe-##L=##H@sourceware.org> List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org> List-Archive: <http://sourceware.org/ml/gdb-patches/> List-Post: <mailto:gdb-patches@sourceware.org> List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs> Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 29607 invoked by uid 89); 15 Sep 2014 21:25:13 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-we0-f182.google.com Received: from mail-we0-f182.google.com (HELO mail-we0-f182.google.com) (74.125.82.182) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Mon, 15 Sep 2014 21:25:07 +0000 Received: by mail-we0-f182.google.com with SMTP id k48so4640121wev.41 for <gdb-patches@sourceware.org>; Mon, 15 Sep 2014 14:25:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=4eRX0/MQVcgzNC+IQst0v73WmdG966Mg4tI4W3KCRmE=; b=NsWQG0FSFA5BfXwp43k1pz/SM67I2fI2nlXHo4WPFfqjAxxPbGwv4U079ax/g2TKF8 hOAcK6kXZMVYD7Fv/j6E31SKET3b/Hz9NJ7zyPOnOwT4smQiRSj1ngYGNJ7YuifRO9qJ 4zxFjlh93YTE+he30xT7wn7xxifRGgnpILB4/cWIqK8P75BVEiMIN0XQkispeybEH1lM WFHShu3r8x4dmk9jItaju42D/TTLeLmSfAjY5tiwRgJ5idBa8gX3MuK5rYDrBO4F6dtb kihtq8HqKEv/pclodMeQfKfYixqDzjFdAC9A5ZlJ71yT2IAo931U+SwqyNrpJDNpwZBF HeXQ== X-Gm-Message-State: ALoCoQllOZaDz3qM3mda7VJTqcfnLNIQagXVbvC1DDf2ak7XjVBfinX+g1/Bynp5ox0tvs1YXEnU X-Received: by 10.194.90.233 with SMTP id bz9mr14800017wjb.94.1410816304684; Mon, 15 Sep 2014 14:25:04 -0700 (PDT) Received: from localhost.localdomain (host81-133-133-27.in-addr.btopenworld.com. [81.133.133.27]) by mx.google.com with ESMTPSA id ln6sm16122742wjb.13.2014.09.15.14.25.03 for <multiple recipients> (version=TLSv1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Sep 2014 14:25:03 -0700 (PDT) From: James Clarke <jrtc27@jrtc27.com> To: gdb-patches@sourceware.org Cc: James Clarke <jrtc27@jrtc27.com> Subject: [PATCH][PR gdb/17046] Use standard setjmp.h on Darwin Date: Mon, 15 Sep 2014 22:24:14 +0100 Message-Id: <1410816254-24831-1-git-send-email-jrtc27@jrtc27.com> |
Commit Message
Jessica Clarke
Sept. 15, 2014, 9:24 p.m. UTC
The `machine/setjmp.h' header is no longer present on OS X 10.10, and is non-standard. Instead, `darwin-nat.c' should be using the standard `setjmp.h' header. gdb/ChangeLog: 2014-09-15 James Clarke <jrtc27@jrtc27.com> PR gdb/17046 * darwin-nat.c: Import standard setjmp.h rather than the non-standard machine/setjmp.h header that no longer exists as of OS X 10.10. --- gdb/darwin-nat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On Monday, September 15 2014, James Clarke wrote: > The `machine/setjmp.h' header is no longer present on OS X 10.10, and is > non-standard. Instead, `darwin-nat.c' should be using the standard > `setjmp.h' header. Thanks. I am not a Mac user, and I know nothing about the details of the system, but I did a little investigation and I think this is the right fix indeed. FWIW, I found <https://lists.macosforge.org/pipermail/macports-tickets/2014-June/163911.html> which is a related discussion. This is not an approval, BTW. > gdb/ChangeLog: > > 2014-09-15 James Clarke <jrtc27@jrtc27.com> > > PR gdb/17046 > * darwin-nat.c: Import standard setjmp.h rather than the non-standard > machine/setjmp.h header that no longer exists as of OS X 10.10. > --- > gdb/darwin-nat.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c > index af4ec01..e550785 100644 > --- a/gdb/darwin-nat.c > +++ b/gdb/darwin-nat.c > @@ -42,7 +42,7 @@ > > #include <sys/ptrace.h> > #include <sys/signal.h> > -#include <machine/setjmp.h> > +#include <setjmp.h> > #include <sys/types.h> > #include <unistd.h> > #include <signal.h> > -- > 2.1.0
That’s where I got the fix from. Not quite sure why this include location was chosen in the first place; `setjmp.h' was a standard header in pure ANSI C. The only reason I can think of is that older versions had `setjmp.h’ which simply includes `machine/setjmp.h’, which had the actual definitions. James Clarke > On 15 Sep 2014, at 22:35, Sergio Durigan Junior <sergiodj@redhat.com> wrote: > > On Monday, September 15 2014, James Clarke wrote: > >> The `machine/setjmp.h' header is no longer present on OS X 10.10, and is >> non-standard. Instead, `darwin-nat.c' should be using the standard >> `setjmp.h' header. > > Thanks. > > I am not a Mac user, and I know nothing about the details of the system, > but I did a little investigation and I think this is the right fix > indeed. > > FWIW, I found > <https://lists.macosforge.org/pipermail/macports-tickets/2014-June/163911.html> > which is a related discussion. > > This is not an approval, BTW. > > -- > Sergio > GPG key ID: 0x65FC5E36 > Please send encrypted e-mail if possible > http://sergiodj.net/
On 15 Sep 2014, at 23:24, James Clarke <jrtc27@jrtc27.com> wrote: > The `machine/setjmp.h' header is no longer present on OS X 10.10, and is > non-standard. Instead, `darwin-nat.c' should be using the standard > `setjmp.h' header. > > gdb/ChangeLog: > > 2014-09-15 James Clarke <jrtc27@jrtc27.com> > > PR gdb/17046 > * darwin-nat.c: Import standard setjmp.h rather than the non-standard > machine/setjmp.h header that no longer exists as of OS X 10.10. Yes, this is indeed obvious. Please commit. Tristan.
On 14-09-16 04:40 AM, Tristan Gingold wrote: > > On 15 Sep 2014, at 23:24, James Clarke <jrtc27@jrtc27.com> wrote: > >> The `machine/setjmp.h' header is no longer present on OS X 10.10, and is >> non-standard. Instead, `darwin-nat.c' should be using the standard >> `setjmp.h' header. >> >> gdb/ChangeLog: >> >> 2014-09-15 James Clarke <jrtc27@jrtc27.com> >> >> PR gdb/17046 >> * darwin-nat.c: Import standard setjmp.h rather than the non-standard >> machine/setjmp.h header that no longer exists as of OS X 10.10. > > Yes, this is indeed obvious. > > Please commit. > > Tristan. Hi Tristan and James, My mac-user friend mentioned that he needed this fix to build gdb, and wondered why it had not been merged (fell between cracks I suppose). Thanks, Simon
On 15-01-06 05:42 PM, Simon Marchi wrote: > On 14-09-16 04:40 AM, Tristan Gingold wrote: >> >> On 15 Sep 2014, at 23:24, James Clarke <jrtc27@jrtc27.com> wrote: >> >>> The `machine/setjmp.h' header is no longer present on OS X 10.10, and is >>> non-standard. Instead, `darwin-nat.c' should be using the standard >>> `setjmp.h' header. >>> >>> gdb/ChangeLog: >>> >>> 2014-09-15 James Clarke <jrtc27@jrtc27.com> >>> >>> PR gdb/17046 >>> * darwin-nat.c: Import standard setjmp.h rather than the non-standard >>> machine/setjmp.h header that no longer exists as of OS X 10.10. >> >> Yes, this is indeed obvious. >> >> Please commit. >> >> Tristan. > > Hi Tristan and James, > > My mac-user friend mentioned that he needed this fix to build gdb, and wondered > why it had not been merged (fell between cracks I suppose). > > Thanks, > > Simon I'll push this as obvious on Friday if it hasn't been already. Simon
> >>> 2014-09-15 James Clarke <jrtc27@jrtc27.com> > >>> > >>> PR gdb/17046 > >>> * darwin-nat.c: Import standard setjmp.h rather than the non-standard > >>> machine/setjmp.h header that no longer exists as of OS X 10.10. [...] > I'll push this as obvious on Friday if it hasn't been already. Given that branching is potentially tomorrow, and that this causes a build failure for which the only workaround is to edit the code, I just pushed it now. That way, we won't have to push it on the branch after we've created it. https://www.sourceware.org/ml/gdb-cvs/2015-01/msg00090.html
On 15-01-12 12:21 PM, Joel Brobecker wrote: >>>>> 2014-09-15 James Clarke <jrtc27@jrtc27.com> >>>>> >>>>> PR gdb/17046 >>>>> * darwin-nat.c: Import standard setjmp.h rather than the non-standard >>>>> machine/setjmp.h header that no longer exists as of OS X 10.10. > [...] >> I'll push this as obvious on Friday if it hasn't been already. > > Given that branching is potentially tomorrow, and that this causes > a build failure for which the only workaround is to edit the code, > I just pushed it now. That way, we won't have to push it on the branch > after we've created it. > > https://www.sourceware.org/ml/gdb-cvs/2015-01/msg00090.html Thanks a lot!
diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c index af4ec01..e550785 100644 --- a/gdb/darwin-nat.c +++ b/gdb/darwin-nat.c @@ -42,7 +42,7 @@ #include <sys/ptrace.h> #include <sys/signal.h> -#include <machine/setjmp.h> +#include <setjmp.h> #include <sys/types.h> #include <unistd.h> #include <signal.h>