convert to_get_min_fast_tracepoint_insn_len

[deliverable/binutils-gdb.git] / gdb / main.c

diff --git a/gdb/main.c b/gdb/main.c
index 08f46f00168e2403ae12cc83acf0a0038f208fe9..59015f5a9e1da85c5302c28dbfbe67e6bc73d2ee 100644 (file)
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -1,6 +1,6 @@
 /* Top level stuff for GDB, the GNU debugger.
 
-   Copyright (C) 1986-2013 Free Software Foundation, Inc.
+   Copyright (C) 1986-2014 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -39,7 +39,6 @@
 #include "main.h"
 #include "source.h"
 #include "cli/cli-cmds.h"
-#include "python/python.h"
 #include "objfiles.h"
 #include "auto-load.h"
 #include "maint.h"
@@ -588,19 +587,14 @@ captured_main (void *data)
            xfree (interpreter_p);
            interpreter_p = xstrdup (INTERP_INSIGHT);
 #endif
-           use_windows = 1;
            break;
          case OPT_NOWINDOWS:
            /* -nw is equivalent to -i=console.  */
            xfree (interpreter_p);
            interpreter_p = xstrdup (INTERP_CONSOLE);
-           use_windows = 0;
            break;
          case 'f':
            annotation_level = 1;
-           /* We have probably been invoked from emacs.  Disable
-              window interface.  */
-           use_windows = 0;
            break;
          case 's':
            symarg = optarg;
@@ -744,13 +738,6 @@ captured_main (void *data)
          }
       }
 
-    /* If --help or --version or --configuration, disable window
-       interface.  */
-    if (print_help || print_version || print_configuration)
-      {
-       use_windows = 0;
-      }
-
     if (batch_flag)
       quiet = 1;
   }
@@ -1072,7 +1059,6 @@ captured_main (void *data)
 int
 gdb_main (struct captured_main_args *args)
 {
-  use_windows = args->use_windows;
   catch_errors (captured_main, args, "", RETURN_MASK_ALL);
   /* The only way to end up here is by an error (normal exit is
      handled by quit_force()), hence always return an error status.  */