From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 32179 invoked by alias); 2 Jan 2012 13:32:41 -0000 Received: (qmail 32168 invoked by uid 22791); 2 Jan 2012 13:32:41 -0000 X-SWARE-Spam-Status: No, hits=-7.2 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,SPF_HELO_PASS,TW_DB X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 02 Jan 2012 13:32:13 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q02DVuFx031607 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 2 Jan 2012 08:31:56 -0500 Received: from host2.jankratochvil.net (ovpn-116-32.ams2.redhat.com [10.36.116.32]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q02DVpwp018376 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Mon, 2 Jan 2012 08:31:53 -0500 Date: Mon, 02 Jan 2012 13:32:00 -0000 From: Jan Kratochvil To: Pedro Alves Cc: Tom Tromey , Pierre Muller , "'Joel Brobecker'" , gdb-patches@sourceware.org, "'Sergio Durigan'" , "'Kai Tietz'" Subject: [commit] Fix/revert insight build regression by me [Re: [commit] [patch 1/2] Drop gdbtui [+doc changes]] Message-ID: <20120102133150.GA19010@host2.jankratochvil.net> References: <20111221114641.GB25652@host2.jankratochvil.net> <20111221122330.GH23376@adacore.com> <20111221142328.GA8079@host2.jankratochvil.net> <005b01ccbfec$97428d50$c5c7a7f0$@muller@ics-cnrs.unistra.fr> <20111221143139.GA12714@host2.jankratochvil.net> <20111221223523.GA14268@host2.jankratochvil.net> <20120102023006.GA15664@host2.jankratochvil.net> <4F01AB13.3030307@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-2022-jp Content-Disposition: inline In-Reply-To: <4F01AB13.3030307@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-01/txt/msg00032.txt.bz2 On Mon, 02 Jan 2012 14:03:15 +0100, Pedro Alves wrote: > This breaks 'insight' the binary, which similarly to gdbtui, > starts gdb with the "insight" interpreter. ./gdbtk/generic/gdbtk-main.c: In function ‘main’: ./gdbtk/generic/gdbtk-main.c:35:7: error: ‘struct captured_main_args’ has no member named ‘interpreter_p’ Thanks for catching it. Checked in the revert below. Regards, Jan http://sourceware.org/ml/gdb-cvs/2012-01/msg00019.html --- src/gdb/ChangeLog 2012/01/02 09:03:07 1.13688 +++ src/gdb/ChangeLog 2012/01/02 13:29:55 1.13689 @@ -1,3 +1,12 @@ +2012-01-02 Jan Kratochvil + + Revert this part of: + 2012-01-02 Jan Kratochvil + Remove the gdbtui binary. + * gdb.c (main): Remove args.interpreter_p initialization. + * main.c (captured_main): Set INTERPRETER_P directly by INTERP_CONSOLE. + * main.h (struct captured_main_args): Remove interpreter_p. + 2012-01-02 Joel Brobecker * config/djgpp/fnchange.lst: Add entry for ChangeLog-2011. --- src/gdb/gdb.c 2012/01/02 02:28:58 1.13 +++ src/gdb/gdb.c 2012/01/02 13:29:57 1.14 @@ -31,5 +31,6 @@ args.argc = argc; args.argv = argv; args.use_windows = 0; + args.interpreter_p = INTERP_CONSOLE; return gdb_main (&args); } --- src/gdb/main.c 2012/01/02 02:28:58 1.98 +++ src/gdb/main.c 2012/01/02 13:29:57 1.99 @@ -380,7 +380,7 @@ this captured main, or one specified by the user at start up, or the console. Initialize the interpreter to the one requested by the application. */ - interpreter_p = xstrdup (INTERP_CONSOLE); + interpreter_p = xstrdup (context->interpreter_p); /* Parse arguments and options. */ { --- src/gdb/main.h 2012/01/02 02:28:58 1.13 +++ src/gdb/main.h 2012/01/02 13:29:57 1.14 @@ -26,6 +26,7 @@ int argc; char **argv; int use_windows; + const char *interpreter_p; }; extern int gdb_main (struct captured_main_args *);