From 11bf149050e55914c470eebe0e758d3d8c9a700b Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Mon, 2 Jan 2012 13:29:57 +0000 Subject: [PATCH] gdb/ 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. --- gdb/ChangeLog | 9 +++++++++ gdb/gdb.c | 1 + gdb/main.c | 2 +- gdb/main.h | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 405b212..0882b5f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -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. diff --git a/gdb/gdb.c b/gdb/gdb.c index a74eb4c..7a708e2 100644 --- a/gdb/gdb.c +++ b/gdb/gdb.c @@ -31,5 +31,6 @@ main (int argc, char **argv) args.argc = argc; args.argv = argv; args.use_windows = 0; + args.interpreter_p = INTERP_CONSOLE; return gdb_main (&args); } diff --git a/gdb/main.c b/gdb/main.c index 147fdf2..288ec4b 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -380,7 +380,7 @@ captured_main (void *data) 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. */ { diff --git a/gdb/main.h b/gdb/main.h index 627b541..fbbc473 100644 --- a/gdb/main.h +++ b/gdb/main.h @@ -26,6 +26,7 @@ struct captured_main_args int argc; char **argv; int use_windows; + const char *interpreter_p; }; extern int gdb_main (struct captured_main_args *); -- 2.7.4