From patchwork Tue Aug 12 19:22:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kratochvil X-Patchwork-Id: 2376 Received: (qmail 750 invoked by alias); 12 Aug 2014 19:22:15 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 732 invoked by uid 89); 12 Aug 2014 19:22:14 -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, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS, URIBL_BLACK autolearn=no version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 12 Aug 2014 19:22:13 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7CJM801023313 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 12 Aug 2014 15:22:09 -0400 Received: from host2.jankratochvil.net (ovpn-116-19.ams2.redhat.com [10.36.116.19]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s7CJM4e1025766 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NO); Tue, 12 Aug 2014 15:22:07 -0400 Date: Tue, 12 Aug 2014 21:22:04 +0200 From: Jan Kratochvil To: Yao Qi Cc: gdb-patches@sourceware.org Subject: [patch+7.8?] Fix --with-babeltrace with gcc-4.9.1 Message-ID: <20140812192204.GA13299@host2.jankratochvil.net> References: <20140804202907.GA2608@host2.jankratochvil.net> <53E17E14.8070104@codesourcery.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <53E17E14.8070104@codesourcery.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-IsSubscribed: yes On Wed, 06 Aug 2014 03:00:04 +0200, Yao Qi wrote: > This patch fixes https://sourceware.org/bugzilla/show_bug.cgi?id=17104 > Please mention it in ChangeLog entry. I had a patch to this PR, but > didn't follow it up. Yours is fine. I think the one of yours is better, posting it here for new approval. IMO it could go also for 7.8.1. My original reproducer is wrong, one also has to specify -Wall in CFLAGS: CFLAGS=-Wall ./configure --with-babeltrace; make Thanks, Jan gdb/ 2014-07-01 Yao Qi PR build/17104 * configure.ac: Use local variable 'pos'. * configure: Regenerated. diff --git a/gdb/configure b/gdb/configure index a4c0a8c..7956aa7 100755 --- a/gdb/configure +++ b/gdb/configure @@ -15234,6 +15234,7 @@ struct bt_iter_pos *pos = bt_iter_get_pos (bt_ctf_get_iter (NULL)); struct bt_ctf_event *event = NULL; const struct bt_definition *scope; + bt_iter_set_pos (bt_ctf_get_iter (NULL), pos); scope = bt_ctf_get_top_level_scope (event, BT_STREAM_EVENT_HEADER); bt_ctf_get_uint64 (bt_ctf_get_field (event, scope, "id")); diff --git a/gdb/configure.ac b/gdb/configure.ac index a2ac15f..fc1d8bc 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -2417,6 +2417,7 @@ else struct bt_ctf_event *event = NULL; const struct bt_definition *scope; + bt_iter_set_pos (bt_ctf_get_iter (NULL), pos); scope = bt_ctf_get_top_level_scope (event, BT_STREAM_EVENT_HEADER); bt_ctf_get_uint64 (bt_ctf_get_field (event, scope, "id"));