Remove duplicated #include's from GDB

This patch simply removes duplicated #include statements in the gdb/
directory.  If there are two duplicated #include statements, this patch
keeps the first #include and removes the second.

Those duplicates have been found by using the checkincludes.pl tool from
the Linux kernel and double checked manually once again if the #include
statements are affected by #ifdef macros.

2014-01-06  Honggyu Kim  <hong.gyu.kim@lge.com>

	* ada-lang.c: Remove duplicated include statements.
	* alphabsd-nat.c: Ditto.
	* amd64-darwin-tdep.c: Ditto.
	* amd64fbsd-nat.c: Ditto.
	* auto-load.c: Ditto.
	* ax-gdb.c: Ditto.
	* breakpoint.c: Ditto.
	* dbxread.c: Ditto.
	* fork-child.c: Ditto.
	* gdb_usleep.c: Ditto.
	* i386-darwin-tdep.c: Ditto.
	* i386fbsd-nat.c: Ditto.
	* infcmd.c: Ditto.
	* inferior.c: Ditto.
	* jv-lang.c: Ditto.
	* linux-nat.c: Ditto.
	* linux-tdep.c: Ditto.
	* m68kbsd-nat.c: Ditto.
	* m68klinux-nat.c: Ditto.
	* microblaze-tdep.c: Ditto.
	* mips-linux-tdep.c: Ditto.
	* mn10300-tdep.c: Ditto.
	* nto-tdep.c: Ditto.
	* opencl-lang.c: Ditto.
	* osdata.c: Ditto.
	* printcmd.c: Ditto.
	* regcache.c: Ditto.
	* remote-m32r-sdi.c: Ditto.
	* remote.c: Ditto.
	* symfile.c: Ditto.
	* symtab.c: Ditto.
	* tilegx-linux-nat.c: Ditto.
	* tilegx-tdep.c: Ditto.
	* tracepoint.c: Ditto.
	* valops.c: Ditto.
	* vaxbsd-nat.c: Ditto.
	* windows-nat.c: Ditto.
	* xtensa-tdep.c: Ditto.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8bb7943..b16f344 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,44 @@
+2014-01-07  Honggyu Kim  <hong.gyu.kim@lge.com>
+
+       * ada-lang.c: Remove duplicated include statements.
+       * alphabsd-nat.c: Ditto.
+       * amd64-darwin-tdep.c: Ditto.
+       * amd64fbsd-nat.c: Ditto.
+       * auto-load.c: Ditto.
+       * ax-gdb.c: Ditto.
+       * breakpoint.c: Ditto.
+       * dbxread.c: Ditto.
+       * fork-child.c: Ditto.
+       * gdb_usleep.c: Ditto.
+       * i386-darwin-tdep.c: Ditto.
+       * i386fbsd-nat.c: Ditto.
+       * infcmd.c: Ditto.
+       * inferior.c: Ditto.
+       * jv-lang.c: Ditto.
+       * linux-nat.c: Ditto.
+       * linux-tdep.c: Ditto.
+       * m68kbsd-nat.c: Ditto.
+       * m68klinux-nat.c: Ditto.
+       * microblaze-tdep.c: Ditto.
+       * mips-linux-tdep.c: Ditto.
+       * mn10300-tdep.c: Ditto.
+       * nto-tdep.c: Ditto.
+       * opencl-lang.c: Ditto.
+       * osdata.c: Ditto.
+       * printcmd.c: Ditto.
+       * regcache.c: Ditto.
+       * remote-m32r-sdi.c: Ditto.
+       * remote.c: Ditto.
+       * symfile.c: Ditto.
+       * symtab.c: Ditto.
+       * tilegx-linux-nat.c: Ditto.
+       * tilegx-tdep.c: Ditto.
+       * tracepoint.c: Ditto.
+       * valops.c: Ditto.
+       * vaxbsd-nat.c: Ditto.
+       * windows-nat.c: Ditto.
+       * xtensa-tdep.c: Ditto.
+
 2014-01-07  Yao Qi  <yao@codesourcery.com>
 
        * spu-linux-nat.c (_initialize_spu_nat): Declare.

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index c14b684..e70a33b 100644 (file)
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -64,7 +64,6 @@
 #include "value.h"
 #include "mi/mi-common.h"
 #include "arch-utils.h"
-#include "exceptions.h"
 #include "cli/cli-utils.h"
 
 /* Define whether or not the C operator '/' truncates towards zero for

diff --git a/gdb/alphabsd-nat.c b/gdb/alphabsd-nat.c
index 3a02bbd..00afa8a 100644 (file)
--- a/gdb/alphabsd-nat.c
+++ b/gdb/alphabsd-nat.c
@@ -157,7 +157,6 @@ alphabsd_store_inferior_registers (struct target_ops *ops,
 
 /* Support for debugging kernel virtual memory images.  */
 
-#include <sys/types.h>
 #include <sys/signal.h>
 #include <machine/pcb.h>
 

diff --git a/gdb/amd64-darwin-tdep.c b/gdb/amd64-darwin-tdep.c
index eb3adf2..5b897d2 100644 (file)
--- a/gdb/amd64-darwin-tdep.c
+++ b/gdb/amd64-darwin-tdep.c
@@ -33,8 +33,6 @@
 #include "amd64-tdep.h"
 #include "osabi.h"
 #include "ui-out.h"
-#include "symtab.h"
-#include "frame.h"
 #include "amd64-darwin-tdep.h"
 #include "i386-darwin-tdep.h"
 #include "solib.h"

diff --git a/gdb/amd64fbsd-nat.c b/gdb/amd64fbsd-nat.c
index e8ffd00..72dc39b 100644 (file)
--- a/gdb/amd64fbsd-nat.c
+++ b/gdb/amd64fbsd-nat.c
@@ -95,7 +95,6 @@ static int amd64fbsd32_r_reg_offset[I386_NUM_GREGS] =
 
 /* Support for debugging kernel virtual memory images.  */
 
-#include <sys/types.h>
 #include <machine/pcb.h>
 #include <osreldate.h>
 

diff --git a/gdb/auto-load.c b/gdb/auto-load.c
index 4bb4ced..fd612b2 100644 (file)
--- a/gdb/auto-load.c
+++ b/gdb/auto-load.c
@@ -36,7 +36,6 @@
 #include "gdb_vecs.h"
 #include "readline/tilde.h"
 #include "completer.h"
-#include "observer.h"
 #include "fnmatch.h"
 #include "top.h"
 #include "filestuff.h"

diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c
index 94caa44..9e27265 100644 (file)
--- a/gdb/ax-gdb.c
+++ b/gdb/ax-gdb.c
@@ -34,7 +34,6 @@
 #include "block.h"
 #include "regcache.h"
 #include "user-regs.h"
-#include "language.h"
 #include "dictionary.h"
 #include "breakpoint.h"
 #include "tracepoint.h"

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 114762d..66a69b5 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -66,7 +66,6 @@
 #include "continuations.h"
 #include "stack.h"
 #include "skip.h"
-#include "gdb_regex.h"
 #include "ax-gdb.h"
 #include "dummy-frame.h"
 

diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index 1bab8b8..9a10a1f 100644 (file)
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -58,7 +58,6 @@
 #include "block.h"
 
 #include "gdb_assert.h"
-#include <string.h>
 
 #include "aout/aout64.h"
 #include "aout/stab_gnu.h"     /* We always use GNU stabs, not

diff --git a/gdb/fork-child.c b/gdb/fork-child.c
index d4403b8..6c42d2e 100644 (file)
--- a/gdb/fork-child.c
+++ b/gdb/fork-child.c
@@ -27,7 +27,6 @@
 #include "gdb_wait.h"
 #include "gdb_vfork.h"
 #include "gdbcore.h"
-#include "terminal.h"
 #include "gdbthread.h"
 #include "command.h" /* for dont_repeat () */
 #include "gdbcmd.h"

diff --git a/gdb/gdb_usleep.c b/gdb/gdb_usleep.c
index e05fc43..5cd6bb0 100644 (file)
--- a/gdb/gdb_usleep.c
+++ b/gdb/gdb_usleep.c
@@ -18,7 +18,6 @@
 #include "defs.h"
 #include "gdb_usleep.h"
 #include "gdb_select.h"
-#include "gdb_usleep.h"
 
 #include <sys/time.h>
 

diff --git a/gdb/i386-darwin-tdep.c b/gdb/i386-darwin-tdep.c
index dd982c4..f2c08d7 100644 (file)
--- a/gdb/i386-darwin-tdep.c
+++ b/gdb/i386-darwin-tdep.c
@@ -33,8 +33,6 @@
 #include "i386-tdep.h"
 #include "osabi.h"
 #include "ui-out.h"
-#include "symtab.h"
-#include "frame.h"
 #include "gdb_assert.h"
 #include "i386-darwin-tdep.h"
 #include "solib.h"

diff --git a/gdb/i386fbsd-nat.c b/gdb/i386fbsd-nat.c
index 3dee2fe..6d78171 100644 (file)
--- a/gdb/i386fbsd-nat.c
+++ b/gdb/i386fbsd-nat.c
@@ -82,7 +82,6 @@ i386fbsd_resume (struct target_ops *ops,
 
 /* Support for debugging kernel virtual memory images.  */
 
-#include <sys/types.h>
 #include <machine/pcb.h>
 
 #include "bsd-kvm.h"

diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 648be74..2d50f41 100644 (file)
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -32,7 +32,6 @@
 #include "gdbcore.h"
 #include "target.h"
 #include "language.h"
-#include "symfile.h"
 #include "objfiles.h"
 #include "completer.h"
 #include "ui-out.h"

diff --git a/gdb/inferior.c b/gdb/inferior.c
index 83862d5..90d9649 100644 (file)
--- a/gdb/inferior.c
+++ b/gdb/inferior.c
@@ -27,7 +27,6 @@
 #include "gdbthread.h"
 #include "ui-out.h"
 #include "observer.h"
-#include "gdbthread.h"
 #include "gdbcore.h"
 #include "symfile.h"
 #include "environ.h"

diff --git a/gdb/jv-lang.c b/gdb/jv-lang.c
index 2bcc6b7..243a45a 100644 (file)
--- a/gdb/jv-lang.c
+++ b/gdb/jv-lang.c
@@ -23,8 +23,6 @@
 #include "expression.h"
 #include "parser-defs.h"
 #include "language.h"
-#include "gdbtypes.h"
-#include "symtab.h"
 #include "symfile.h"
 #include "objfiles.h"
 #include <string.h>

diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index bf6f586..4dfb3ff 100644 (file)
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -46,7 +46,6 @@
 #include "gregset.h"           /* for gregset */
 #include "gdbcore.h"           /* for get_exec_file */
 #include <ctype.h>             /* for isdigit */
-#include "gdbthread.h"         /* for struct thread_info etc.  */
 #include <sys/stat.h>          /* for struct stat */
 #include <fcntl.h>             /* for O_RDONLY */
 #include "inf-loop.h"
@@ -65,7 +64,6 @@
 #include "agent.h"
 #include "tracepoint.h"
 #include "exceptions.h"
-#include "linux-ptrace.h"
 #include "buffer.h"
 #include "target-descriptions.h"
 #include "filestuff.h"

diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c
index 4dbe3ed..bd1e5a2 100644 (file)
--- a/gdb/linux-tdep.c
+++ b/gdb/linux-tdep.c
@@ -32,7 +32,6 @@
 #include "cli/cli-utils.h"
 #include "arch-utils.h"
 #include "gdb_obstack.h"
-#include "cli/cli-utils.h"
 
 #include <ctype.h>
 

diff --git a/gdb/m68kbsd-nat.c b/gdb/m68kbsd-nat.c
index 311f3a8..dbd0e15 100644 (file)
--- a/gdb/m68kbsd-nat.c
+++ b/gdb/m68kbsd-nat.c
@@ -176,7 +176,6 @@ m68kbsd_store_inferior_registers (struct target_ops *ops,
 
 /* Support for debugging kernel virtual memory images.  */
 
-#include <sys/types.h>
 #include <machine/pcb.h>
 
 #include "bsd-kvm.h"

diff --git a/gdb/m68klinux-nat.c b/gdb/m68klinux-nat.c
index 0a8d400..a512a71 100644 (file)
--- a/gdb/m68klinux-nat.c
+++ b/gdb/m68klinux-nat.c
@@ -46,8 +46,6 @@
 
 #include "floatformat.h"
 
-#include "target.h"
-
 /* Prototypes for supply_gregset etc.  */
 #include "gregset.h"
 

diff --git a/gdb/microblaze-tdep.c b/gdb/microblaze-tdep.c
index 078cc32..efca90d 100644 (file)
--- a/gdb/microblaze-tdep.c
+++ b/gdb/microblaze-tdep.c
@@ -29,7 +29,6 @@
 #include "inferior.h"
 #include "regcache.h"
 #include "target.h"
-#include "frame.h"
 #include "frame-base.h"
 #include "frame-unwind.h"
 #include "dwarf2-frame.h"

diff --git a/gdb/mips-linux-tdep.c b/gdb/mips-linux-tdep.c
index 0c41444..6c0459d 100644 (file)
--- a/gdb/mips-linux-tdep.c
+++ b/gdb/mips-linux-tdep.c
@@ -32,7 +32,6 @@
 #include "gdbtypes.h"
 #include "objfiles.h"
 #include "solib.h"
-#include "solib-svr4.h"
 #include "solist.h"
 #include "symtab.h"
 #include "target-descriptions.h"

diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c
index 61c7a5e..ac53ae4 100644 (file)
--- a/gdb/mn10300-tdep.c
+++ b/gdb/mn10300-tdep.c
@@ -26,7 +26,6 @@
 #include "gdb_assert.h"
 #include "gdbcore.h"   /* For write_memory_unsigned_integer.  */
 #include "value.h"
-#include "gdbtypes.h"
 #include "frame.h"
 #include "frame-unwind.h"
 #include "frame-base.h"

diff --git a/gdb/nto-tdep.c b/gdb/nto-tdep.c
index f12a208..cc61423 100644 (file)
--- a/gdb/nto-tdep.c
+++ b/gdb/nto-tdep.c
@@ -32,8 +32,6 @@
 #include "gdbcore.h"
 #include "objfiles.h"
 
-#include <string.h>
-
 #ifdef __CYGWIN__
 #include <sys/cygwin.h>
 #endif

diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c
index f098b3f..8dbd4ce 100644 (file)
--- a/gdb/opencl-lang.c
+++ b/gdb/opencl-lang.c
@@ -24,7 +24,6 @@
 #include "symtab.h"
 #include "expression.h"
 #include "parser-defs.h"
-#include "symtab.h"
 #include "language.h"
 #include "varobj.h"
 #include "c-lang.h"

diff --git a/gdb/osdata.c b/gdb/osdata.c
index 467e2f1..887b4e3 100644 (file)
--- a/gdb/osdata.c
+++ b/gdb/osdata.c
@@ -45,8 +45,6 @@ osdata_parse (const char *xml)
 
 #else /* HAVE_LIBEXPAT */
 
-#include "xml-support.h"
-
 /* Internal parsing data passed to all XML callbacks.  */
 struct osdata_parsing_data
   {

diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 2acc562..10d3c23 100644 (file)
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -41,7 +41,6 @@
 #include "block.h"
 #include "disasm.h"
 #include "dfp.h"
-#include "valprint.h"
 #include "exceptions.h"
 #include "observer.h"
 #include "solist.h"

diff --git a/gdb/regcache.c b/gdb/regcache.c
index 876039d..6c5915b 100644 (file)
--- a/gdb/regcache.c
+++ b/gdb/regcache.c
@@ -26,7 +26,6 @@
 #include "reggroups.h"
 #include "gdb_assert.h"
 #include <string.h>
-#include "gdbcmd.h"            /* For maintenanceprintlist.  */
 #include "observer.h"
 #include "exceptions.h"
 #include "remote.h"

diff --git a/gdb/remote-m32r-sdi.c b/gdb/remote-m32r-sdi.c
index f5a0b5a..7b122d7 100644 (file)
--- a/gdb/remote-m32r-sdi.c
+++ b/gdb/remote-m32r-sdi.c
@@ -37,7 +37,6 @@
 #endif
 #include <sys/types.h>
 #include <sys/time.h>
-#include <signal.h>
 #include <time.h>
 #include "gdb_bfd.h"
 #include "cli/cli-utils.h"

diff --git a/gdb/remote.c b/gdb/remote.c
index 3f51a93..8366c5d 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -46,7 +46,6 @@
 #include "gdb_bfd.h"
 #include "filestuff.h"
 
-#include <ctype.h>
 #include <sys/time.h>
 
 #include "event-loop.h"

diff --git a/gdb/symfile.c b/gdb/symfile.c
index 4f0fea8..ddeefb7 100644 (file)
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -57,7 +57,6 @@
 #include "stack.h"
 #include "gdb_bfd.h"
 #include "cli/cli-utils.h"
-#include "target.h"
 
 #include <sys/types.h>
 #include <fcntl.h>

diff --git a/gdb/symtab.c b/gdb/symtab.c
index f215586..acfdd46 100644 (file)
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -60,7 +60,6 @@
 #include "solist.h"
 #include "macrotab.h"
 #include "macroscope.h"
-#include "ada-lang.h"
 
 #include "psymtab.h"
 #include "parser-defs.h"

diff --git a/gdb/tilegx-linux-nat.c b/gdb/tilegx-linux-nat.c
index 61bca3f..a00f386 100644 (file)
--- a/gdb/tilegx-linux-nat.c
+++ b/gdb/tilegx-linux-nat.c
@@ -30,15 +30,12 @@
 
 #include <sys/procfs.h>
 
+/* Defines ps_err_e, struct ps_prochandle.  */
 #include "gdb_proc_service.h"
-#include <sys/ptrace.h>
 
 /* Prototypes for supply_gregset etc.  */
 #include "gregset.h"
 
-/* Defines ps_err_e, struct ps_prochandle.  */
-#include "gdb_proc_service.h"
-
 /* The register sets used in GNU/Linux ELF core-dumps are identical to
    the register sets in `struct user' that is used for a.out
    core-dumps, and is also used by `ptrace'.  The corresponding types

diff --git a/gdb/tilegx-tdep.c b/gdb/tilegx-tdep.c
index 993b3f4..d2aae95 100644 (file)
--- a/gdb/tilegx-tdep.c
+++ b/gdb/tilegx-tdep.c
@@ -41,7 +41,6 @@
 #include "linux-tdep.h"
 #include "objfiles.h"
 #include "solib-svr4.h"
-#include "symtab.h"
 #include "tilegx-tdep.h"
 #include "opcode/tilegx.h"
 

diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 198b6dd..582c284 100644 (file)
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -45,7 +45,6 @@
 #include "filenames.h"
 #include "gdbthread.h"
 #include "stack.h"
-#include "gdbcore.h"
 #include "remote.h"
 #include "source.h"
 #include "ax.h"
@@ -55,7 +54,6 @@
 #include "cli/cli-utils.h"
 #include "probe.h"
 #include "ctf.h"
-#include "completer.h"
 #include "filestuff.h"
 
 /* readline include files */

diff --git a/gdb/valops.c b/gdb/valops.c
index fdae3ad..5382c49 100644 (file)
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -39,10 +39,8 @@
 #include <errno.h>
 #include <string.h>
 #include "gdb_assert.h"
-#include "cp-support.h"
 #include "observer.h"
 #include "objfiles.h"
-#include "symtab.h"
 #include "exceptions.h"
 
 extern unsigned int overload_debug;

diff --git a/gdb/vaxbsd-nat.c b/gdb/vaxbsd-nat.c
index b8c4657..bc31eca 100644 (file)
--- a/gdb/vaxbsd-nat.c
+++ b/gdb/vaxbsd-nat.c
@@ -98,7 +98,6 @@ vaxbsd_store_inferior_registers (struct target_ops *ops,
 
 /* Support for debugging kernel virtual memory images.  */
 
-#include <sys/types.h>
 #include <machine/pcb.h>
 
 #include "bsd-kvm.h"

diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index b57adaa..6cd2c46 100644 (file)
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -43,7 +43,6 @@
 #include <sys/cygwin.h>
 #include <cygwin/version.h>
 #endif
-#include <signal.h>
 
 #include "buildsym.h"
 #include "filenames.h"

diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
index e52b89d..432a9de 100644 (file)
--- a/gdb/xtensa-tdep.c
+++ b/gdb/xtensa-tdep.c
@@ -37,7 +37,6 @@
 #include "dwarf2.h"
 #include "dwarf2-frame.h"
 #include "dwarf2loc.h"
-#include "frame.h"
 #include "frame-base.h"
 #include "frame-unwind.h"