Merge GDB 7.5.1

gdb/tui/tui-main.c

Index: gdb/tui/tui-main.c
diff --git a/gdb/tui/tui-main.c b/gdb/tui/tui-main.c
deleted file mode 100644
index d12fa747051ebd6d74f08ca59e658dde719ea1e1..0000000000000000000000000000000000000000
--- a/gdb/tui/tui-main.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Main function for TUI gdb.
-
-   Copyright (C) 2002, 2004, 2007-2012 Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* The binary "gdbtui" is deprecated.
-
-   The binary will be no longer built or installed in GDB 7.5.
-   Use "gdb -tui" instead.  */
-
-#include "defs.h"
-#include "main.h"
-#include "gdb_string.h"
-#include "interps.h"
-
-int
-main (int argc, char **argv)
-{
-  struct captured_main_args args;
-
-  memset (&args, 0, sizeof args);
-  args.argc = argc;
-  args.argv = argv;
-  args.use_windows = 0;
-  args.interpreter_p = INTERP_TUI;
-  return gdb_main (&args);
-}