gdb/

	Revert this part of:
	2012-01-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
	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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 405b212675ce247597b4ff4f6f7bcb10ec21889b..0882b5fbc2822a0f83c3b6949684e2895ad6dc53 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2012-01-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       Revert this part of:
+       2012-01-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
+       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  <brobecker@adacore.com>
 
        * config/djgpp/fnchange.lst: Add entry for ChangeLog-2011.

diff --git a/gdb/gdb.c b/gdb/gdb.c
index a74eb4c09c3cba0923e6b38ee925743adfc850ef..7a708e2ff47188449839424fc1dfda66432e2af7 100644 (file)
--- 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 147fdf2984c0ed73ba96f676b287dce57d9c5175..288ec4b1f1992f7f014ee0932d2d27cf21d18881 100644 (file)
--- 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 627b541c2f163579dd5264fed96ab19ffeb80664..fbbc473a45729671409a73ffb423c4a1aca4bf0d 100644 (file)
--- 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 *);