diff options
| author |   Tom Tromey <tom@tromey.com> | 2019-04-06 13:38:10 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-04-06 13:47:34 -0600 |
| commit | 4de283e4b5f21207fe12f99913d1f28d4f07843c (patch) | |
| tree | 83381f10ec18231d29ea2239d7922c17a14fd15c | |
| parent | x86: Move x86-specific linker options to elf_linker_x86_params (diff) | |
| download | binutils-gdb-4de283e4b5f21207fe12f99913d1f28d4f07843c.tar.gz binutils-gdb-4de283e4b5f21207fe12f99913d1f28d4f07843c.tar.bz2 binutils-gdb-4de283e4b5f21207fe12f99913d1f28d4f07843c.zip | |
Revert the header-sorting patch
Andreas Schwab and John Baldwin pointed out some bugs in the header
sorting patch; and I noticed that the output was not correct when
limited to a subset of files (a bug in my script).
So, I'm reverting the patch. I may try again after fixing the issues
pointed out.
gdb/ChangeLog
2019-04-05 Tom Tromey <tom@tromey.com>
Revert the header-sorting patch.
* ft32-tdep.c: Revert.
* frv-tdep.c: Revert.
* frv-linux-tdep.c: Revert.
* frame.c: Revert.
* frame-unwind.c: Revert.
* frame-base.c: Revert.
* fork-child.c: Revert.
* findvar.c: Revert.
* findcmd.c: Revert.
* filesystem.c: Revert.
* filename-seen-cache.h: Revert.
* filename-seen-cache.c: Revert.
* fbsd-tdep.c: Revert.
* fbsd-nat.h: Revert.
* fbsd-nat.c: Revert.
* f-valprint.c: Revert.
* f-typeprint.c: Revert.
* f-lang.c: Revert.
* extension.h: Revert.
* extension.c: Revert.
* extension-priv.h: Revert.
* expprint.c: Revert.
* exec.h: Revert.
* exec.c: Revert.
* exceptions.c: Revert.
* event-top.c: Revert.
* event-loop.c: Revert.
* eval.c: Revert.
* elfread.c: Revert.
* dwarf2read.h: Revert.
* dwarf2read.c: Revert.
* dwarf2loc.c: Revert.
* dwarf2expr.h: Revert.
* dwarf2expr.c: Revert.
* dwarf2-frame.c: Revert.
* dwarf2-frame-tailcall.c: Revert.
* dwarf-index-write.h: Revert.
* dwarf-index-write.c: Revert.
* dwarf-index-common.c: Revert.
* dwarf-index-cache.h: Revert.
* dwarf-index-cache.c: Revert.
* dummy-frame.c: Revert.
* dtrace-probe.c: Revert.
* disasm.h: Revert.
* disasm.c: Revert.
* disasm-selftests.c: Revert.
* dictionary.c: Revert.
* dicos-tdep.c: Revert.
* demangle.c: Revert.
* dcache.h: Revert.
* dcache.c: Revert.
* darwin-nat.h: Revert.
* darwin-nat.c: Revert.
* darwin-nat-info.c: Revert.
* d-valprint.c: Revert.
* d-namespace.c: Revert.
* d-lang.c: Revert.
* ctf.c: Revert.
* csky-tdep.c: Revert.
* csky-linux-tdep.c: Revert.
* cris-tdep.c: Revert.
* cris-linux-tdep.c: Revert.
* cp-valprint.c: Revert.
* cp-support.c: Revert.
* cp-namespace.c: Revert.
* cp-abi.c: Revert.
* corelow.c: Revert.
* corefile.c: Revert.
* continuations.c: Revert.
* completer.h: Revert.
* completer.c: Revert.
* complaints.c: Revert.
* coffread.c: Revert.
* coff-pe-read.c: Revert.
* cli-out.h: Revert.
* cli-out.c: Revert.
* charset.c: Revert.
* c-varobj.c: Revert.
* c-valprint.c: Revert.
* c-typeprint.c: Revert.
* c-lang.c: Revert.
* buildsym.c: Revert.
* buildsym-legacy.c: Revert.
* build-id.h: Revert.
* build-id.c: Revert.
* btrace.c: Revert.
* bsd-uthread.c: Revert.
* breakpoint.h: Revert.
* breakpoint.c: Revert.
* break-catch-throw.c: Revert.
* break-catch-syscall.c: Revert.
* break-catch-sig.c: Revert.
* blockframe.c: Revert.
* block.c: Revert.
* bfin-tdep.c: Revert.
* bfin-linux-tdep.c: Revert.
* bfd-target.c: Revert.
* bcache.c: Revert.
* ax-general.c: Revert.
* ax-gdb.h: Revert.
* ax-gdb.c: Revert.
* avr-tdep.c: Revert.
* auxv.c: Revert.
* auto-load.c: Revert.
* arm-wince-tdep.c: Revert.
* arm-tdep.c: Revert.
* arm-symbian-tdep.c: Revert.
* arm-pikeos-tdep.c: Revert.
* arm-obsd-tdep.c: Revert.
* arm-nbsd-tdep.c: Revert.
* arm-nbsd-nat.c: Revert.
* arm-linux-tdep.c: Revert.
* arm-linux-nat.c: Revert.
* arm-fbsd-tdep.c: Revert.
* arm-fbsd-nat.c: Revert.
* arm-bsd-tdep.c: Revert.
* arch-utils.c: Revert.
* arc-tdep.c: Revert.
* arc-newlib-tdep.c: Revert.
* annotate.h: Revert.
* annotate.c: Revert.
* amd64-windows-tdep.c: Revert.
* amd64-windows-nat.c: Revert.
* amd64-tdep.c: Revert.
* amd64-sol2-tdep.c: Revert.
* amd64-obsd-tdep.c: Revert.
* amd64-obsd-nat.c: Revert.
* amd64-nbsd-tdep.c: Revert.
* amd64-nbsd-nat.c: Revert.
* amd64-nat.c: Revert.
* amd64-linux-tdep.c: Revert.
* amd64-linux-nat.c: Revert.
* amd64-fbsd-tdep.c: Revert.
* amd64-fbsd-nat.c: Revert.
* amd64-dicos-tdep.c: Revert.
* amd64-darwin-tdep.c: Revert.
* amd64-bsd-nat.c: Revert.
* alpha-tdep.c: Revert.
* alpha-obsd-tdep.c: Revert.
* alpha-nbsd-tdep.c: Revert.
* alpha-mdebug-tdep.c: Revert.
* alpha-linux-tdep.c: Revert.
* alpha-linux-nat.c: Revert.
* alpha-bsd-tdep.c: Revert.
* alpha-bsd-nat.c: Revert.
* aix-thread.c: Revert.
* agent.c: Revert.
* addrmap.c: Revert.
* ada-varobj.c: Revert.
* ada-valprint.c: Revert.
* ada-typeprint.c: Revert.
* ada-tasks.c: Revert.
* ada-lang.c: Revert.
* aarch64-tdep.c: Revert.
* aarch64-ravenscar-thread.c: Revert.
* aarch64-newlib-tdep.c: Revert.
* aarch64-linux-tdep.c: Revert.
* aarch64-linux-nat.c: Revert.
* aarch64-fbsd-tdep.c: Revert.
* aarch64-fbsd-nat.c: Revert.
* aarch32-linux-nat.c: Revert.
162 files changed, 1426 insertions, 1593 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cad57a49b6f..7d79c8141e5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,170 @@ 2019-04-05 Tom Tromey <tom@tromey.com> + Revert the header-sorting patch. + * ft32-tdep.c: Revert. + * frv-tdep.c: Revert. + * frv-linux-tdep.c: Revert. + * frame.c: Revert. + * frame-unwind.c: Revert. + * frame-base.c: Revert. + * fork-child.c: Revert. + * findvar.c: Revert. + * findcmd.c: Revert. + * filesystem.c: Revert. + * filename-seen-cache.h: Revert. + * filename-seen-cache.c: Revert. + * fbsd-tdep.c: Revert. + * fbsd-nat.h: Revert. + * fbsd-nat.c: Revert. + * f-valprint.c: Revert. + * f-typeprint.c: Revert. + * f-lang.c: Revert. + * extension.h: Revert. + * extension.c: Revert. + * extension-priv.h: Revert. + * expprint.c: Revert. + * exec.h: Revert. + * exec.c: Revert. + * exceptions.c: Revert. + * event-top.c: Revert. + * event-loop.c: Revert. + * eval.c: Revert. + * elfread.c: Revert. + * dwarf2read.h: Revert. + * dwarf2read.c: Revert. + * dwarf2loc.c: Revert. + * dwarf2expr.h: Revert. + * dwarf2expr.c: Revert. + * dwarf2-frame.c: Revert. + * dwarf2-frame-tailcall.c: Revert. + * dwarf-index-write.h: Revert. + * dwarf-index-write.c: Revert. + * dwarf-index-common.c: Revert. + * dwarf-index-cache.h: Revert. + * dwarf-index-cache.c: Revert. + * dummy-frame.c: Revert. + * dtrace-probe.c: Revert. + * disasm.h: Revert. + * disasm.c: Revert. + * disasm-selftests.c: Revert. + * dictionary.c: Revert. + * dicos-tdep.c: Revert. + * demangle.c: Revert. + * dcache.h: Revert. + * dcache.c: Revert. + * darwin-nat.h: Revert. + * darwin-nat.c: Revert. + * darwin-nat-info.c: Revert. + * d-valprint.c: Revert. + * d-namespace.c: Revert. + * d-lang.c: Revert. + * ctf.c: Revert. + * csky-tdep.c: Revert. + * csky-linux-tdep.c: Revert. + * cris-tdep.c: Revert. + * cris-linux-tdep.c: Revert. + * cp-valprint.c: Revert. + * cp-support.c: Revert. + * cp-namespace.c: Revert. + * cp-abi.c: Revert. + * corelow.c: Revert. + * corefile.c: Revert. + * continuations.c: Revert. + * completer.h: Revert. + * completer.c: Revert. + * complaints.c: Revert. + * coffread.c: Revert. + * coff-pe-read.c: Revert. + * cli-out.h: Revert. + * cli-out.c: Revert. + * charset.c: Revert. + * c-varobj.c: Revert. + * c-valprint.c: Revert. + * c-typeprint.c: Revert. + * c-lang.c: Revert. + * buildsym.c: Revert. + * buildsym-legacy.c: Revert. + * build-id.h: Revert. + * build-id.c: Revert. + * btrace.c: Revert. + * bsd-uthread.c: Revert. + * breakpoint.h: Revert. + * breakpoint.c: Revert. + * break-catch-throw.c: Revert. + * break-catch-syscall.c: Revert. + * break-catch-sig.c: Revert. + * blockframe.c: Revert. + * block.c: Revert. + * bfin-tdep.c: Revert. + * bfin-linux-tdep.c: Revert. + * bfd-target.c: Revert. + * bcache.c: Revert. + * ax-general.c: Revert. + * ax-gdb.h: Revert. + * ax-gdb.c: Revert. + * avr-tdep.c: Revert. + * auxv.c: Revert. + * auto-load.c: Revert. + * arm-wince-tdep.c: Revert. + * arm-tdep.c: Revert. + * arm-symbian-tdep.c: Revert. + * arm-pikeos-tdep.c: Revert. + * arm-obsd-tdep.c: Revert. + * arm-nbsd-tdep.c: Revert. + * arm-nbsd-nat.c: Revert. + * arm-linux-tdep.c: Revert. + * arm-linux-nat.c: Revert. + * arm-fbsd-tdep.c: Revert. + * arm-fbsd-nat.c: Revert. + * arm-bsd-tdep.c: Revert. + * arch-utils.c: Revert. + * arc-tdep.c: Revert. + * arc-newlib-tdep.c: Revert. + * annotate.h: Revert. + * annotate.c: Revert. + * amd64-windows-tdep.c: Revert. + * amd64-windows-nat.c: Revert. + * amd64-tdep.c: Revert. + * amd64-sol2-tdep.c: Revert. + * amd64-obsd-tdep.c: Revert. + * amd64-obsd-nat.c: Revert. + * amd64-nbsd-tdep.c: Revert. + * amd64-nbsd-nat.c: Revert. + * amd64-nat.c: Revert. + * amd64-linux-tdep.c: Revert. + * amd64-linux-nat.c: Revert. + * amd64-fbsd-tdep.c: Revert. + * amd64-fbsd-nat.c: Revert. + * amd64-dicos-tdep.c: Revert. + * amd64-darwin-tdep.c: Revert. + * amd64-bsd-nat.c: Revert. + * alpha-tdep.c: Revert. + * alpha-obsd-tdep.c: Revert. + * alpha-nbsd-tdep.c: Revert. + * alpha-mdebug-tdep.c: Revert. + * alpha-linux-tdep.c: Revert. + * alpha-linux-nat.c: Revert. + * alpha-bsd-tdep.c: Revert. + * alpha-bsd-nat.c: Revert. + * aix-thread.c: Revert. + * agent.c: Revert. + * addrmap.c: Revert. + * ada-varobj.c: Revert. + * ada-valprint.c: Revert. + * ada-typeprint.c: Revert. + * ada-tasks.c: Revert. + * ada-lang.c: Revert. + * aarch64-tdep.c: Revert. + * aarch64-ravenscar-thread.c: Revert. + * aarch64-newlib-tdep.c: Revert. + * aarch64-linux-tdep.c: Revert. + * aarch64-linux-nat.c: Revert. + * aarch64-fbsd-tdep.c: Revert. + * aarch64-fbsd-nat.c: Revert. + * aarch32-linux-nat.c: Revert. + +2019-04-05 Tom Tromey <tom@tromey.com> + * ft32-tdep.c: Sort headers. * frv-tdep.c: Sort headers. * frv-linux-tdep.c: Sort headers. diff --git a/gdb/aarch32-linux-nat.c b/gdb/aarch32-linux-nat.c index 6471626810b..e23dbb1bbbe 100644 --- a/gdb/aarch32-linux-nat.c +++ b/gdb/aarch32-linux-nat.c @@ -17,12 +17,12 @@ #include "defs.h" -/* Local non-gdb includes. */ -#include "aarch32-linux-nat.h" -#include "arch/arm-linux.h" -#include "arm-linux-tdep.h" -#include "arm-tdep.h" #include "regcache.h" +#include "arm-tdep.h" +#include "arm-linux-tdep.h" +#include "arch/arm-linux.h" + +#include "aarch32-linux-nat.h" /* Supply GP registers contents, stored in REGS, to REGCACHE. ARM_APCS_32 is true if the 32-bit mode is in use, otherwise, it is false. */ diff --git a/gdb/aarch64-fbsd-nat.c b/gdb/aarch64-fbsd-nat.c index cb4130a2844..bb187a600d0 100644 --- a/gdb/aarch64-fbsd-nat.c +++ b/gdb/aarch64-fbsd-nat.c @@ -18,18 +18,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" +#include "target.h" -/* Standard C includes. */ -#include <machine/reg.h> -#include <sys/ptrace.h> #include <sys/types.h> +#include <sys/ptrace.h> +#include <machine/reg.h> -/* Local non-gdb includes. */ -#include "aarch64-fbsd-tdep.h" -#include "aarch64-tdep.h" #include "fbsd-nat.h" +#include "aarch64-tdep.h" +#include "aarch64-fbsd-tdep.h" #include "inf-ptrace.h" -#include "target.h" struct aarch64_fbsd_nat_target final : public fbsd_nat_target { diff --git a/gdb/aarch64-fbsd-tdep.c b/gdb/aarch64-fbsd-tdep.c index 63850abe5a1..c611ff350bd 100644 --- a/gdb/aarch64-fbsd-tdep.c +++ b/gdb/aarch64-fbsd-tdep.c @@ -19,16 +19,15 @@ #include "defs.h" -/* Local non-gdb includes. */ -#include "aarch64-fbsd-tdep.h" -#include "aarch64-tdep.h" -#include "fbsd-tdep.h" #include "gdbarch.h" +#include "fbsd-tdep.h" +#include "aarch64-tdep.h" +#include "aarch64-fbsd-tdep.h" #include "osabi.h" #include "solib-svr4.h" #include "target.h" -#include "trad-frame.h" #include "tramp-frame.h" +#include "trad-frame.h" /* Register maps. */ diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c index b9e68801dd1..6d43eb7070f 100644 --- a/gdb/aarch64-linux-nat.c +++ b/gdb/aarch64-linux-nat.c @@ -20,29 +20,29 @@ #include "defs.h" -/* Standard C includes. */ -#include <asm/ptrace.h> -#include <sys/utsname.h> - -/* Local non-gdb includes. */ -#include "aarch32-linux-nat.h" -#include "aarch64-linux-tdep.h" -#include "aarch64-tdep.h" -#include "auxv.h" -#include "elf/common.h" -#include "elf/external.h" -#include "gdbcmd.h" -#include "gdbcore.h" -#include "gregset.h" #include "inferior.h" +#include "gdbcore.h" +#include "regcache.h" #include "linux-nat.h" -#include "linux-tdep.h" -#include "nat/aarch64-linux-hw-point.h" +#include "target-descriptions.h" +#include "auxv.h" +#include "gdbcmd.h" +#include "aarch64-tdep.h" +#include "aarch64-linux-tdep.h" +#include "aarch32-linux-nat.h" #include "nat/aarch64-linux.h" +#include "nat/aarch64-linux-hw-point.h" #include "nat/aarch64-sve-linux-ptrace.h" + +#include "elf/external.h" +#include "elf/common.h" + #include "nat/gdb_ptrace.h" -#include "regcache.h" -#include "target-descriptions.h" +#include <sys/utsname.h> +#include <asm/ptrace.h> + +#include "gregset.h" +#include "linux-tdep.h" /* Defines ps_err_e, struct ps_prochandle. */ #include "gdb_proc_service.h" diff --git a/gdb/aarch64-linux-tdep.c b/gdb/aarch64-linux-tdep.c index 5a126b0c83c..7f2193f2fa5 100644 --- a/gdb/aarch64-linux-tdep.c +++ b/gdb/aarch64-linux-tdep.c @@ -20,33 +20,33 @@ #include "defs.h" -/* Standard C includes. */ -#include <ctype.h> - -/* Local non-gdb includes. */ -#include "aarch64-linux-tdep.h" -#include "aarch64-tdep.h" -#include "arch-utils.h" -#include "auxv.h" -#include "cli/cli-utils.h" -#include "elf/common.h" #include "gdbarch.h" +#include "arch-utils.h" #include "glibc-tdep.h" -#include "inferior.h" -#include "linux-record.h" #include "linux-tdep.h" +#include "aarch64-tdep.h" +#include "aarch64-linux-tdep.h" #include "osabi.h" -#include "parser-defs.h" -#include "record-full.h" -#include "regcache.h" -#include "regset.h" #include "solib-svr4.h" -#include "stap-probe.h" #include "symtab.h" -#include "trad-frame.h" #include "tramp-frame.h" +#include "trad-frame.h" + +#include "inferior.h" +#include "regcache.h" +#include "regset.h" + +#include "cli/cli-utils.h" +#include "stap-probe.h" +#include "parser-defs.h" #include "user-regs.h" #include "xml-syscall.h" +#include <ctype.h> + +#include "record-full.h" +#include "linux-record.h" +#include "auxv.h" +#include "elf/common.h" /* Signal frame handling. diff --git a/gdb/aarch64-newlib-tdep.c b/gdb/aarch64-newlib-tdep.c index 3c1c8986bef..131f0991970 100644 --- a/gdb/aarch64-newlib-tdep.c +++ b/gdb/aarch64-newlib-tdep.c @@ -20,9 +20,8 @@ #include "defs.h" -/* Local non-gdb includes. */ -#include "aarch64-tdep.h" #include "gdbarch.h" +#include "aarch64-tdep.h" #include "osabi.h" /* Implement the 'init_osabi' method of struct gdb_osabi_handler. */ diff --git a/gdb/aarch64-ravenscar-thread.c b/gdb/aarch64-ravenscar-thread.c index b6709fca22e..3e87a4bf5b9 100644 --- a/gdb/aarch64-ravenscar-thread.c +++ b/gdb/aarch64-ravenscar-thread.c @@ -18,14 +18,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "aarch64-ravenscar-thread.h" -#include "aarch64-tdep.h" #include "gdbcore.h" +#include "regcache.h" +#include "aarch64-tdep.h" #include "inferior.h" #include "ravenscar-thread.h" -#include "regcache.h" +#include "aarch64-ravenscar-thread.h" #define NO_OFFSET -1 diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c index ca0d0023126..68b6549ba9b 100644 --- a/gdb/aarch64-tdep.c +++ b/gdb/aarch64-tdep.c @@ -20,44 +20,46 @@ #include "defs.h" -/* Standard C++ includes. */ -#include <algorithm> - -/* Local non-gdb includes. */ -#include "aarch64-ravenscar-thread.h" -#include "aarch64-tdep.h" -#include "arch-utils.h" -#include "arch/aarch64-insn.h" -#include "ax-gdb.h" -#include "ax.h" -#include "common/selftest.h" -#include "common/vec.h" -#include "dis-asm.h" -#include "dwarf2-frame.h" -#include "dwarf2.h" -#include "elf-bfd.h" -#include "elf/aarch64.h" -#include "frame-base.h" -#include "frame-unwind.h" #include "frame.h" +#include "inferior.h" #include "gdbcmd.h" #include "gdbcore.h" -#include "gdbtypes.h" -#include "infcall.h" -#include "inferior.h" -#include "language.h" -#include "objfiles.h" -#include "opcode/aarch64.h" -#include "osabi.h" -#include "prologue-value.h" -#include "record-full.h" -#include "record.h" +#include "dis-asm.h" #include "regcache.h" #include "reggroups.h" -#include "target-descriptions.h" +#include "value.h" +#include "arch-utils.h" +#include "osabi.h" +#include "frame-unwind.h" +#include "frame-base.h" #include "trad-frame.h" +#include "objfiles.h" +#include "dwarf2.h" +#include "dwarf2-frame.h" +#include "gdbtypes.h" +#include "prologue-value.h" +#include "target-descriptions.h" #include "user-regs.h" -#include "value.h" +#include "language.h" +#include "infcall.h" +#include "ax.h" +#include "ax-gdb.h" +#include "common/selftest.h" + +#include "aarch64-tdep.h" +#include "aarch64-ravenscar-thread.h" + +#include "elf-bfd.h" +#include "elf/aarch64.h" + +#include "common/vec.h" + +#include "record.h" +#include "record-full.h" +#include "arch/aarch64-insn.h" + +#include "opcode/aarch64.h" +#include <algorithm> #define submask(x) ((1L << ((x) + 1)) - 1) #define bit(obj,st) (((obj) >> (st)) & 1) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 10ae7cb75de..51615dcd361 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -19,55 +19,50 @@ #include "defs.h" - -/* Standard C includes. */ #include <ctype.h> -#include <sys/stat.h> - -/* Standard C++ includes. */ -#include <algorithm> - -/* Local non-gdb includes. */ -#include "ada-lang.h" -#include "annotate.h" -#include "arch-utils.h" -#include "block.h" -#include "breakpoint.h" -#include "c-lang.h" -#include "cli/cli-utils.h" -#include "common/byte-vector.h" -#include "common/function-view.h" -#include "common/gdb_vecs.h" -#include "common/vec.h" -#include "completer.h" #include "demangle.h" -#include "dictionary.h" -#include "expression.h" -#include "frame.h" -#include "gdb_obstack.h" #include "gdb_regex.h" +#include "frame.h" +#include "symtab.h" +#include "gdbtypes.h" #include "gdbcmd.h" +#include "expression.h" +#include "parser-defs.h" +#include "language.h" +#include "varobj.h" +#include "c-lang.h" +#include "inferior.h" +#include "symfile.h" +#include "objfiles.h" +#include "breakpoint.h" #include "gdbcore.h" -#include "gdbtypes.h" #include "hashtab.h" +#include "gdb_obstack.h" +#include "ada-lang.h" +#include "completer.h" +#include <sys/stat.h> +#include "ui-out.h" +#include "block.h" #include "infcall.h" -#include "inferior.h" -#include "language.h" -#include "mi/mi-common.h" -#include "namespace.h" -#include "objfiles.h" -#include "observable.h" -#include "parser-defs.h" -#include "psymtab.h" +#include "dictionary.h" +#include "annotate.h" +#include "valprint.h" #include "source.h" +#include "observable.h" +#include "common/vec.h" #include "stack.h" -#include "symfile.h" -#include "symtab.h" +#include "common/gdb_vecs.h" #include "typeprint.h" -#include "ui-out.h" -#include "valprint.h" +#include "namespace.h" + +#include "psymtab.h" #include "value.h" -#include "varobj.h" +#include "mi/mi-common.h" +#include "arch-utils.h" +#include "cli/cli-utils.h" +#include "common/function-view.h" +#include "common/byte-vector.h" +#include <algorithm> /* Define whether or not the C operator '/' truncates towards zero for differently signed operands (truncation direction is undefined in C). diff --git a/gdb/ada-tasks.c b/gdb/ada-tasks.c index b143c67aa7c..ccabc631040 100644 --- a/gdb/ada-tasks.c +++ b/gdb/ada-tasks.c @@ -16,17 +16,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "ada-lang.h" +#include "observable.h" #include "gdbcmd.h" +#include "target.h" +#include "ada-lang.h" #include "gdbcore.h" -#include "gdbthread.h" #include "inferior.h" -#include "objfiles.h" -#include "observable.h" +#include "gdbthread.h" #include "progspace.h" -#include "target.h" +#include "objfiles.h" static int ada_build_task_list (); diff --git a/gdb/ada-typeprint.c b/gdb/ada-typeprint.c index 4502b81a741..efcd14bedc5 100644 --- a/gdb/ada-typeprint.c +++ b/gdb/ada-typeprint.c @@ -17,28 +17,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C includes. */ -#include <ctype.h> - -/* Local non-gdb includes. */ -#include "ada-lang.h" -#include "bfd.h" -#include "c-lang.h" -#include "cli/cli-style.h" -#include "command.h" -#include "demangle.h" -#include "expression.h" #include "gdb_obstack.h" -#include "gdbcmd.h" -#include "gdbcore.h" -#include "gdbtypes.h" -#include "language.h" +#include "bfd.h" /* Binary File Description */ #include "symtab.h" -#include "target-float.h" +#include "gdbtypes.h" +#include "expression.h" +#include "value.h" +#include "gdbcore.h" #include "target.h" +#include "command.h" +#include "gdbcmd.h" +#include "language.h" +#include "demangle.h" +#include "c-lang.h" +#include "cli/cli-style.h" #include "typeprint.h" -#include "value.h" +#include "target-float.h" +#include "ada-lang.h" +#include <ctype.h> static int print_selected_record_field_types (struct type *, struct type *, int, int, diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c index 3fa7d909817..d4661e1f1d4 100644 --- a/gdb/ada-valprint.c +++ b/gdb/ada-valprint.c @@ -18,24 +18,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C includes. */ #include <ctype.h> - -/* Local non-gdb includes. */ -#include "ada-lang.h" +#include "symtab.h" +#include "gdbtypes.h" +#include "expression.h" +#include "value.h" +#include "demangle.h" +#include "valprint.h" +#include "language.h" #include "annotate.h" +#include "ada-lang.h" #include "c-lang.h" -#include "demangle.h" -#include "expression.h" -#include "gdbtypes.h" #include "infcall.h" -#include "language.h" #include "objfiles.h" -#include "symtab.h" #include "target-float.h" -#include "valprint.h" -#include "value.h" static int print_field_values (struct type *, const gdb_byte *, int, diff --git a/gdb/ada-varobj.c b/gdb/ada-varobj.c index 3f375c8f04a..a4d553d3786 100644 --- a/gdb/ada-varobj.c +++ b/gdb/ada-varobj.c @@ -18,12 +18,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ #include "ada-lang.h" +#include "varobj.h" #include "language.h" #include "valprint.h" -#include "varobj.h" /* Implementation principle used in this unit: diff --git a/gdb/addrmap.c b/gdb/addrmap.c index d49076b5ae7..6c3ed6945fb 100644 --- a/gdb/addrmap.c +++ b/gdb/addrmap.c @@ -18,11 +18,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "addrmap.h" -#include "gdb_obstack.h" #include "splay-tree.h" +#include "gdb_obstack.h" +#include "addrmap.h" /* The "abstract class". */ diff --git a/gdb/agent.c b/gdb/agent.c index aa3e0df7780..8b777d0b3b7 100644 --- a/gdb/agent.c +++ b/gdb/agent.c @@ -16,12 +16,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ #include "command.h" -#include "common/agent.h" #include "gdbcmd.h" #include "target.h" +#include "common/agent.h" /* Enum strings for "set|show agent". */ diff --git a/gdb/aix-thread.c b/gdb/aix-thread.c index 7646a3da6ce..ffa3352d039 100644 --- a/gdb/aix-thread.c +++ b/gdb/aix-thread.c @@ -40,24 +40,21 @@ */ #include "defs.h" +#include "gdbthread.h" +#include "target.h" +#include "inferior.h" +#include "regcache.h" +#include "gdbcmd.h" +#include "ppc-tdep.h" +#include "observable.h" +#include "objfiles.h" -/* Standard C includes. */ #include <procinfo.h> -#include <sched.h> -#include <sys/pthdebug.h> +#include <sys/types.h> #include <sys/ptrace.h> #include <sys/reg.h> -#include <sys/types.h> - -/* Local non-gdb includes. */ -#include "gdbcmd.h" -#include "gdbthread.h" -#include "inferior.h" -#include "objfiles.h" -#include "observable.h" -#include "ppc-tdep.h" -#include "regcache.h" -#include "target.h" +#include <sched.h> +#include <sys/pthdebug.h> #if !HAVE_DECL_GETTHRDS extern int getthrds (pid_t, struct thrdsinfo64 *, int, tid_t *, int); diff --git a/gdb/alpha-bsd-nat.c b/gdb/alpha-bsd-nat.c index d51660458b9..b12d19f3434 100644 --- a/gdb/alpha-bsd-nat.c +++ b/gdb/alpha-bsd-nat.c @@ -18,21 +18,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" +#include "inferior.h" +#include "regcache.h" -/* Standard C includes. */ +#include "alpha-tdep.h" +#include "alpha-bsd-tdep.h" +#include "inf-ptrace.h" + +#include <sys/types.h> +#include <sys/ptrace.h> #include <machine/reg.h> + #ifdef HAVE_SYS_PROCFS_H #include <sys/procfs.h> #endif -#include <sys/ptrace.h> -#include <sys/types.h> - -/* Local non-gdb includes. */ -#include "alpha-bsd-tdep.h" -#include "alpha-tdep.h" -#include "inf-ptrace.h" -#include "inferior.h" -#include "regcache.h" #ifndef HAVE_GREGSET_T typedef struct reg gregset_t; diff --git a/gdb/alpha-bsd-tdep.c b/gdb/alpha-bsd-tdep.c index a032f95adff..350c197b0e1 100644 --- a/gdb/alpha-bsd-tdep.c +++ b/gdb/alpha-bsd-tdep.c @@ -18,11 +18,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" +#include "regcache.h" -/* Local non-gdb includes. */ -#include "alpha-bsd-tdep.h" #include "alpha-tdep.h" -#include "regcache.h" +#include "alpha-bsd-tdep.h" /* Conviently, GDB uses the same register numbering as the ptrace register structure used by BSD on Alpha. */ diff --git a/gdb/alpha-linux-nat.c b/gdb/alpha-linux-nat.c index 91f5b4c6fb0..18806971a76 100644 --- a/gdb/alpha-linux-nat.c +++ b/gdb/alpha-linux-nat.c @@ -17,18 +17,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" +#include "target.h" +#include "regcache.h" +#include "linux-nat-trad.h" -/* Standard C includes. */ +#include "alpha-tdep.h" + +#include "nat/gdb_ptrace.h" #include <alpha/ptrace.h> -#include <sys/procfs.h> -/* Local non-gdb includes. */ -#include "alpha-tdep.h" +#include <sys/procfs.h> #include "gregset.h" -#include "linux-nat-trad.h" -#include "nat/gdb_ptrace.h" -#include "regcache.h" -#include "target.h" /* The address of UNIQUE for ptrace. */ #define ALPHA_UNIQUE_PTRACE_ADDR 65 diff --git a/gdb/alpha-linux-tdep.c b/gdb/alpha-linux-tdep.c index fbfd6b3f8d5..bfa611e646f 100644 --- a/gdb/alpha-linux-tdep.c +++ b/gdb/alpha-linux-tdep.c @@ -17,16 +17,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "alpha-tdep.h" #include "frame.h" -#include "linux-tdep.h" #include "osabi.h" -#include "regcache.h" -#include "regset.h" #include "solib-svr4.h" #include "symtab.h" +#include "regset.h" +#include "regcache.h" +#include "linux-tdep.h" +#include "alpha-tdep.h" /* This enum represents the signals' numbers on the Alpha architecture. It just contains the signal definitions which are diff --git a/gdb/alpha-mdebug-tdep.c b/gdb/alpha-mdebug-tdep.c index 590aa8e5772..caab08b1220 100644 --- a/gdb/alpha-mdebug-tdep.c +++ b/gdb/alpha-mdebug-tdep.c @@ -17,18 +17,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "alpha-tdep.h" -#include "block.h" -#include "frame-base.h" -#include "frame-unwind.h" #include "frame.h" -#include "gdbcore.h" -#include "mdebugread.h" +#include "frame-unwind.h" +#include "frame-base.h" #include "symtab.h" +#include "gdbcore.h" +#include "block.h" #include "trad-frame.h" +#include "alpha-tdep.h" +#include "mdebugread.h" + /* FIXME: Some of this code should perhaps be merged with mips. */ /* *INDENT-OFF* */ diff --git a/gdb/alpha-nbsd-tdep.c b/gdb/alpha-nbsd-tdep.c index 1922fec9c13..534b64687e3 100644 --- a/gdb/alpha-nbsd-tdep.c +++ b/gdb/alpha-nbsd-tdep.c @@ -20,19 +20,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "alpha-bsd-tdep.h" -#include "alpha-tdep.h" #include "frame.h" #include "gdbcore.h" -#include "nbsd-tdep.h" #include "osabi.h" #include "regcache.h" #include "regset.h" +#include "value.h" + +#include "alpha-tdep.h" +#include "alpha-bsd-tdep.h" +#include "nbsd-tdep.h" #include "solib-svr4.h" #include "target.h" -#include "value.h" /* Core file support. */ diff --git a/gdb/alpha-obsd-tdep.c b/gdb/alpha-obsd-tdep.c index 0e6450f7e8f..d7e292603af 100644 --- a/gdb/alpha-obsd-tdep.c +++ b/gdb/alpha-obsd-tdep.c @@ -18,14 +18,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "alpha-bsd-tdep.h" -#include "alpha-tdep.h" #include "frame.h" #include "gdbcore.h" -#include "obsd-tdep.h" #include "osabi.h" + +#include "obsd-tdep.h" +#include "alpha-tdep.h" +#include "alpha-bsd-tdep.h" #include "solib-svr4.h" /* Signal trampolines. */ diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c index b47b0f0928d..af9b9b97407 100644 --- a/gdb/alpha-tdep.c +++ b/gdb/alpha-tdep.c @@ -18,33 +18,31 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C++ includes. */ -#include <algorithm> - -/* Local non-gdb includes. */ -#include "alpha-tdep.h" -#include "arch-utils.h" -#include "block.h" -#include "dis-asm.h" -#include "dwarf2-frame.h" -#include "elf-bfd.h" -#include "frame-base.h" -#include "frame-unwind.h" #include "frame.h" +#include "frame-unwind.h" +#include "frame-base.h" +#include "dwarf2-frame.h" +#include "inferior.h" +#include "symtab.h" +#include "value.h" #include "gdbcmd.h" #include "gdbcore.h" -#include "infcall.h" -#include "inferior.h" -#include "linespec.h" +#include "dis-asm.h" +#include "symfile.h" #include "objfiles.h" -#include "osabi.h" +#include "linespec.h" #include "regcache.h" #include "reggroups.h" -#include "symfile.h" -#include "symtab.h" +#include "arch-utils.h" +#include "osabi.h" +#include "block.h" +#include "infcall.h" #include "trad-frame.h" -#include "value.h" + +#include "elf-bfd.h" + +#include "alpha-tdep.h" +#include <algorithm> /* Instruction decoding. The notations for registers, immediates and opcodes are the same as the one used in Compaq's Alpha architecture diff --git a/gdb/amd64-bsd-nat.c b/gdb/amd64-bsd-nat.c index 07ddb86c155..35763a5b955 100644 --- a/gdb/amd64-bsd-nat.c +++ b/gdb/amd64-bsd-nat.c @@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ #include "inferior.h" #include "regcache.h" #include "target.h" diff --git a/gdb/amd64-darwin-tdep.c b/gdb/amd64-darwin-tdep.c index 5d21ba755d8..46867f40a38 100644 --- a/gdb/amd64-darwin-tdep.c +++ b/gdb/amd64-darwin-tdep.c @@ -19,25 +19,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "amd64-darwin-tdep.h" -#include "amd64-tdep.h" -#include "common/x86-xstate.h" -#include "dwarf2-frame.h" #include "frame.h" -#include "gdbcore.h" -#include "i386-darwin-tdep.h" -#include "i387-tdep.h" #include "inferior.h" +#include "gdbcore.h" +#include "target.h" +#include "symtab.h" +#include "regcache.h" #include "objfiles.h" + +#include "i387-tdep.h" +#include "common/x86-xstate.h" +#include "amd64-tdep.h" #include "osabi.h" -#include "regcache.h" -#include "solib-darwin.h" -#include "solib.h" -#include "symtab.h" -#include "target.h" #include "ui-out.h" +#include "amd64-darwin-tdep.h" +#include "i386-darwin-tdep.h" +#include "solib.h" +#include "solib-darwin.h" +#include "dwarf2-frame.h" /* Offsets into the struct x86_thread_state64 where we'll find the saved regs. From <mach/i386/thread_status.h> and amd64-tdep.h. */ diff --git a/gdb/amd64-dicos-tdep.c b/gdb/amd64-dicos-tdep.c index 4dbb20104c5..8ca838e3c83 100644 --- a/gdb/amd64-dicos-tdep.c +++ b/gdb/amd64-dicos-tdep.c @@ -18,12 +18,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ +#include "osabi.h" #include "amd64-tdep.h" #include "common/x86-xstate.h" #include "dicos-tdep.h" -#include "osabi.h" static void amd64_dicos_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) diff --git a/gdb/amd64-fbsd-nat.c b/gdb/amd64-fbsd-nat.c index 4e5291082a2..cc676d3214f 100644 --- a/gdb/amd64-fbsd-nat.c +++ b/gdb/amd64-fbsd-nat.c @@ -18,26 +18,23 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" +#include "inferior.h" +#include "regcache.h" +#include "target.h" -/* Standard C includes. */ -#include <machine/reg.h> #include <signal.h> +#include <sys/types.h> #include <sys/ptrace.h> #include <sys/sysctl.h> -#include <sys/types.h> #include <sys/user.h> +#include <machine/reg.h> -/* Local non-gdb includes. */ -#include "amd64-bsd-nat.h" -#include "amd64-nat.h" -#include "amd64-tdep.h" -#include "common/x86-xstate.h" #include "fbsd-nat.h" -#include "inferior.h" -#include "regcache.h" -#include "target.h" +#include "amd64-tdep.h" +#include "amd64-nat.h" +#include "amd64-bsd-nat.h" #include "x86-nat.h" - +#include "common/x86-xstate.h" class amd64_fbsd_nat_target final diff --git a/gdb/amd64-fbsd-tdep.c b/gdb/amd64-fbsd-tdep.c index 9c5ff301ef3..7e2e9edf21d 100644 --- a/gdb/amd64-fbsd-tdep.c +++ b/gdb/amd64-fbsd-tdep.c @@ -18,18 +18,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "amd64-tdep.h" #include "arch-utils.h" -#include "common/x86-xstate.h" -#include "fbsd-tdep.h" #include "frame.h" #include "gdbcore.h" -#include "i386-fbsd-tdep.h" -#include "osabi.h" #include "regcache.h" +#include "osabi.h" #include "regset.h" +#include "i386-fbsd-tdep.h" +#include "common/x86-xstate.h" + +#include "amd64-tdep.h" +#include "fbsd-tdep.h" #include "solib-svr4.h" /* Support for signal handlers. */ diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c index 853c73c1530..a0bb105f5aa 100644 --- a/gdb/amd64-linux-nat.c +++ b/gdb/amd64-linux-nat.c @@ -19,27 +19,25 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C includes. */ +#include "inferior.h" +#include "regcache.h" +#include "elf/common.h" +#include <sys/uio.h> +#include "nat/gdb_ptrace.h" #include <asm/prctl.h> #include <sys/reg.h> -#include <sys/uio.h> +#include "gregset.h" +#include "gdb_proc_service.h" -/* Local non-gdb includes. */ -#include "amd64-linux-tdep.h" #include "amd64-nat.h" #include "amd64-tdep.h" -#include "common/x86-xstate.h" -#include "elf/common.h" -#include "gdb_proc_service.h" -#include "gregset.h" +#include "amd64-linux-tdep.h" #include "i386-linux-tdep.h" -#include "inferior.h" -#include "nat/amd64-linux-siginfo.h" -#include "nat/gdb_ptrace.h" -#include "nat/linux-ptrace.h" -#include "regcache.h" +#include "common/x86-xstate.h" + #include "x86-linux-nat.h" +#include "nat/linux-ptrace.h" +#include "nat/amd64-linux-siginfo.h" /* This definition comes from prctl.h. Kernels older than 2.5.64 do not have it. */ diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c index 8d27225b4ad..5475cf629f3 100644 --- a/gdb/amd64-linux-tdep.c +++ b/gdb/amd64-linux-tdep.c @@ -19,29 +19,28 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "amd64-linux-tdep.h" -#include "amd64-tdep.h" #include "arch-utils.h" -#include "arch/amd64.h" -#include "common/x86-xstate.h" #include "frame.h" #include "gdbcore.h" -#include "gdbtypes.h" -#include "glibc-tdep.h" -#include "i386-linux-tdep.h" -#include "linux-tdep.h" -#include "osabi.h" -#include "parser-defs.h" #include "regcache.h" +#include "osabi.h" +#include "symtab.h" +#include "gdbtypes.h" #include "reggroups.h" #include "regset.h" -#include "solib-svr4.h" -#include "symtab.h" -#include "target-descriptions.h" +#include "parser-defs.h" #include "user-regs.h" +#include "amd64-linux-tdep.h" +#include "i386-linux-tdep.h" +#include "linux-tdep.h" +#include "common/x86-xstate.h" + +#include "amd64-tdep.h" +#include "solib-svr4.h" #include "xml-syscall.h" +#include "glibc-tdep.h" +#include "arch/amd64.h" +#include "target-descriptions.h" /* The syscall's XML filename for i386. */ #define XML_SYSCALL_FILENAME_AMD64 "syscalls/amd64-linux.xml" diff --git a/gdb/amd64-nat.c b/gdb/amd64-nat.c index 1c02d35f2d7..3dcac73d88a 100644 --- a/gdb/amd64-nat.c +++ b/gdb/amd64-nat.c @@ -18,14 +18,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "amd64-nat.h" -#include "amd64-tdep.h" #include "gdbarch.h" -#include "i386-tdep.h" #include "regcache.h" +#include "i386-tdep.h" +#include "amd64-tdep.h" +#include "amd64-nat.h" + /* The following bits of code help with implementing debugging 32-bit code natively on AMD64. The idea is to define two mappings between the register number as used by GDB and the register set used by the diff --git a/gdb/amd64-nbsd-nat.c b/gdb/amd64-nbsd-nat.c index 3a610cbbf71..24e3aae7ecb 100644 --- a/gdb/amd64-nbsd-nat.c +++ b/gdb/amd64-nbsd-nat.c @@ -18,13 +18,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" +#include "target.h" -/* Local non-gdb includes. */ +#include "nbsd-nat.h" +#include "amd64-tdep.h" #include "amd64-bsd-nat.h" #include "amd64-nat.h" -#include "amd64-tdep.h" -#include "nbsd-nat.h" -#include "target.h" /* Mapping between the general-purpose registers in NetBSD/amd64 `struct reg' format and GDB's register cache layout for diff --git a/gdb/amd64-nbsd-tdep.c b/gdb/amd64-nbsd-tdep.c index 99b17220545..06905d65dfd 100644 --- a/gdb/amd64-nbsd-tdep.c +++ b/gdb/amd64-nbsd-tdep.c @@ -18,18 +18,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "amd64-tdep.h" #include "arch-utils.h" -#include "common/x86-xstate.h" #include "frame.h" #include "gdbcore.h" -#include "nbsd-tdep.h" #include "osabi.h" -#include "solib-svr4.h" #include "symtab.h" +#include "amd64-tdep.h" +#include "common/x86-xstate.h" +#include "nbsd-tdep.h" +#include "solib-svr4.h" + /* Support for signal handlers. */ /* Return whether THIS_FRAME corresponds to a NetBSD sigtramp diff --git a/gdb/amd64-obsd-nat.c b/gdb/amd64-obsd-nat.c index cf6694e99c2..4963c42d06c 100644 --- a/gdb/amd64-obsd-nat.c +++ b/gdb/amd64-obsd-nat.c @@ -18,15 +18,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" +#include "gdbcore.h" +#include "regcache.h" +#include "target.h" -/* Local non-gdb includes. */ +#include "amd64-tdep.h" #include "amd64-bsd-nat.h" #include "amd64-nat.h" -#include "amd64-tdep.h" -#include "gdbcore.h" #include "obsd-nat.h" -#include "regcache.h" -#include "target.h" /* Mapping between the general-purpose registers in OpenBSD/amd64 `struct reg' format and GDB's register cache layout for diff --git a/gdb/amd64-obsd-tdep.c b/gdb/amd64-obsd-tdep.c index 71a263f1455..cd1a1c31b88 100644 --- a/gdb/amd64-obsd-tdep.c +++ b/gdb/amd64-obsd-tdep.c @@ -18,25 +18,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "amd64-tdep.h" -#include "bsd-uthread.h" -#include "common/x86-xstate.h" -#include "frame-unwind.h" #include "frame.h" +#include "frame-unwind.h" #include "gdbcore.h" -#include "i387-tdep.h" +#include "symtab.h" #include "objfiles.h" -#include "obsd-tdep.h" #include "osabi.h" #include "regcache.h" #include "regset.h" -#include "solib-svr4.h" -#include "symtab.h" #include "target.h" #include "trad-frame.h" +#include "obsd-tdep.h" +#include "amd64-tdep.h" +#include "i387-tdep.h" +#include "common/x86-xstate.h" +#include "solib-svr4.h" +#include "bsd-uthread.h" + /* Support for signal handlers. */ /* Default page size. */ diff --git a/gdb/amd64-sol2-tdep.c b/gdb/amd64-sol2-tdep.c index 7d691e869dd..56d2e225822 100644 --- a/gdb/amd64-sol2-tdep.c +++ b/gdb/amd64-sol2-tdep.c @@ -20,17 +20,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "amd64-tdep.h" -#include "common/x86-xstate.h" #include "frame.h" #include "gdbcore.h" -#include "osabi.h" #include "regcache.h" +#include "osabi.h" +#include "symtab.h" + #include "sol2-tdep.h" +#include "amd64-tdep.h" +#include "common/x86-xstate.h" #include "solib-svr4.h" -#include "symtab.h" /* Mapping between the general-purpose registers in gregset_t format and GDB's register cache layout. */ diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c index 16c3e61306b..d5892954d74 100644 --- a/gdb/amd64-tdep.c +++ b/gdb/amd64-tdep.c @@ -20,38 +20,34 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C++ includes. */ -#include <algorithm> - -/* Local non-gdb includes. */ -#include "amd64-tdep.h" +#include "opcode/i386.h" +#include "dis-asm.h" #include "arch-utils.h" -#include "arch/amd64.h" -#include "ax-gdb.h" -#include "ax.h" #include "block.h" -#include "common/byte-vector.h" -#include "common/x86-xstate.h" -#include "dis-asm.h" -#include "disasm.h" #include "dummy-frame.h" +#include "frame.h" #include "frame-base.h" #include "frame-unwind.h" -#include "frame.h" -#include "gdbcmd.h" -#include "gdbcore.h" -#include "i387-tdep.h" #include "inferior.h" #include "infrun.h" +#include "gdbcmd.h" +#include "gdbcore.h" #include "objfiles.h" -#include "opcode/i386.h" -#include "osabi.h" -#include "producer.h" #include "regcache.h" #include "regset.h" #include "symfile.h" +#include "disasm.h" +#include "amd64-tdep.h" +#include "i387-tdep.h" +#include "common/x86-xstate.h" +#include <algorithm> #include "target-descriptions.h" +#include "arch/amd64.h" +#include "producer.h" +#include "ax.h" +#include "ax-gdb.h" +#include "common/byte-vector.h" +#include "osabi.h" #include "x86-tdep.h" /* Note that the AMD64 architecture was previously known as x86-64. diff --git a/gdb/amd64-windows-nat.c b/gdb/amd64-windows-nat.c index dcefa9fead8..378262a56e3 100644 --- a/gdb/amd64-windows-nat.c +++ b/gdb/amd64-windows-nat.c @@ -16,14 +16,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C includes. */ -#include <windows.h> - -/* Local non-gdb includes. */ -#include "amd64-tdep.h" #include "windows-nat.h" #include "x86-nat.h" +#include "amd64-tdep.h" + +#include <windows.h> #define context_offset(x) (offsetof (CONTEXT, x)) static const int mappings[] = diff --git a/gdb/amd64-windows-tdep.c b/gdb/amd64-windows-tdep.c index 9dfa8e4e9d8..922da9e48bc 100644 --- a/gdb/amd64-windows-tdep.c +++ b/gdb/amd64-windows-tdep.c @@ -16,26 +16,22 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C++ includes. */ -#include <algorithm> - -/* Local non-gdb includes. */ +#include "osabi.h" #include "amd64-tdep.h" -#include "coff/i386.h" -#include "coff/internal.h" -#include "coff/pe.h" #include "common/x86-xstate.h" -#include "frame-unwind.h" -#include "frame.h" -#include "gdbcore.h" #include "gdbtypes.h" -#include "libcoff.h" -#include "objfiles.h" -#include "osabi.h" +#include "gdbcore.h" #include "regcache.h" -#include "value.h" #include "windows-tdep.h" +#include "frame.h" +#include "objfiles.h" +#include "frame-unwind.h" +#include "coff/internal.h" +#include "coff/i386.h" +#include "coff/pe.h" +#include "libcoff.h" +#include "value.h" +#include <algorithm> /* The registers used to pass integer arguments during a function call. */ static int amd64_windows_dummy_call_integer_regs[] = diff --git a/gdb/annotate.c b/gdb/annotate.c index 20df956582d..97cb4c8855d 100644 --- a/gdb/annotate.c +++ b/gdb/annotate.c @@ -17,18 +17,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ #include "annotate.h" -#include "breakpoint.h" +#include "value.h" +#include "target.h" #include "gdbtypes.h" +#include "breakpoint.h" +#include "observable.h" #include "inferior.h" #include "infrun.h" -#include "observable.h" -#include "target.h" #include "top.h" -#include "value.h" - /* Prototypes for local functions. */ diff --git a/gdb/annotate.h b/gdb/annotate.h index b55dffeb072..4a9e1b58f28 100644 --- a/gdb/annotate.h +++ b/gdb/annotate.h @@ -19,8 +19,8 @@ #ifndef ANNOTATE_H #define ANNOTATE_H -#include "gdbtypes.h" #include "symtab.h" +#include "gdbtypes.h" extern void annotate_breakpoint (int); extern void annotate_catchpoint (int); diff --git a/gdb/arc-newlib-tdep.c b/gdb/arc-newlib-tdep.c index c91ec3add9d..5fa4094def8 100644 --- a/gdb/arc-newlib-tdep.c +++ b/gdb/arc-newlib-tdep.c @@ -20,9 +20,8 @@ #include "defs.h" -/* Local non-gdb includes. */ -#include "arc-tdep.h" #include "gdbarch.h" +#include "arc-tdep.h" #include "osabi.h" /* Implement the 'init_osabi' method of struct gdb_osabi_handler. */ diff --git a/gdb/arc-tdep.c b/gdb/arc-tdep.c index 6b899eedd22..009af1190a5 100644 --- a/gdb/arc-tdep.c +++ b/gdb/arc-tdep.c @@ -20,15 +20,13 @@ /* GDB header files. */ #include "defs.h" - -/* Local non-gdb includes. */ #include "arch-utils.h" #include "disasm.h" #include "dwarf2-frame.h" #include "frame-base.h" #include "frame-unwind.h" -#include "gdbcmd.h" #include "gdbcore.h" +#include "gdbcmd.h" #include "objfiles.h" #include "prologue-value.h" #include "trad-frame.h" diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c index ab113bcc0e7..52a08daa3b9 100644 --- a/gdb/arch-utils.c +++ b/gdb/arch-utils.c @@ -19,22 +19,24 @@ #include "defs.h" -/* Local non-gdb includes. */ #include "arch-utils.h" -#include "common/version.h" -#include "dis-asm.h" -#include "floatformat.h" #include "gdbcmd.h" -#include "gdbcore.h" -#include "inferior.h" +#include "inferior.h" /* enum CALL_DUMMY_LOCATION et al. */ #include "infrun.h" -#include "language.h" -#include "objfiles.h" -#include "osabi.h" #include "regcache.h" #include "sim-regno.h" -#include "symtab.h" +#include "gdbcore.h" +#include "osabi.h" #include "target-descriptions.h" +#include "objfiles.h" +#include "language.h" +#include "symtab.h" + +#include "common/version.h" + +#include "floatformat.h" + +#include "dis-asm.h" int default_displaced_step_hw_singlestep (struct gdbarch *gdbarch, diff --git a/gdb/arm-bsd-tdep.c b/gdb/arm-bsd-tdep.c index f6900426f1b..13894c4b14b 100644 --- a/gdb/arm-bsd-tdep.c +++ b/gdb/arm-bsd-tdep.c @@ -18,13 +18,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "arm-tdep.h" #include "osabi.h" #include "regcache.h" #include "regset.h" +#include "arm-tdep.h" + /* Core file support. */ /* Sizeof `struct reg' in <machine/reg.h>. */ diff --git a/gdb/arm-fbsd-nat.c b/gdb/arm-fbsd-nat.c index f0b07804bb4..f85ecc17c05 100644 --- a/gdb/arm-fbsd-nat.c +++ b/gdb/arm-fbsd-nat.c @@ -18,18 +18,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" +#include "target.h" -/* Standard C includes. */ -#include <machine/reg.h> -#include <sys/ptrace.h> #include <sys/types.h> +#include <sys/ptrace.h> +#include <machine/reg.h> -/* Local non-gdb includes. */ -#include "arm-fbsd-tdep.h" -#include "arm-tdep.h" #include "fbsd-nat.h" +#include "arm-tdep.h" +#include "arm-fbsd-tdep.h" #include "inf-ptrace.h" -#include "target.h" struct arm_fbsd_nat_target : public fbsd_nat_target { diff --git a/gdb/arm-fbsd-tdep.c b/gdb/arm-fbsd-tdep.c index c79873c33e1..dea3abbdd36 100644 --- a/gdb/arm-fbsd-tdep.c +++ b/gdb/arm-fbsd-tdep.c @@ -19,11 +19,10 @@ #include "defs.h" -/* Local non-gdb includes. */ -#include "arm-fbsd-tdep.h" +#include "elf/common.h" #include "arm-tdep.h" +#include "arm-fbsd-tdep.h" #include "auxv.h" -#include "elf/common.h" #include "fbsd-tdep.h" #include "gdbcore.h" #include "osabi.h" diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c index 2c2f6952133..52668da9fcf 100644 --- a/gdb/arm-linux-nat.c +++ b/gdb/arm-linux-nat.c @@ -17,29 +17,28 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" +#include "inferior.h" +#include "gdbcore.h" +#include "regcache.h" +#include "target.h" +#include "linux-nat.h" +#include "target-descriptions.h" +#include "auxv.h" +#include "observable.h" +#include "gdbthread.h" + +#include "arm-tdep.h" +#include "arm-linux-tdep.h" +#include "aarch32-linux-nat.h" -/* Standard C includes. */ #include <elf/common.h> -#include <sys/procfs.h> #include <sys/user.h> +#include "nat/gdb_ptrace.h" #include <sys/utsname.h> +#include <sys/procfs.h> -/* Local non-gdb includes. */ -#include "aarch32-linux-nat.h" -#include "arm-linux-tdep.h" -#include "arm-tdep.h" -#include "auxv.h" -#include "gdbcore.h" -#include "gdbthread.h" -#include "inferior.h" -#include "linux-nat.h" -#include "linux-tdep.h" -#include "nat/gdb_ptrace.h" #include "nat/linux-ptrace.h" -#include "observable.h" -#include "regcache.h" -#include "target-descriptions.h" -#include "target.h" +#include "linux-tdep.h" /* Prototypes for supply_gregset etc. */ #include "gregset.h" diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c index 90fadbd5284..a5ad06434c2 100644 --- a/gdb/arm-linux-tdep.c +++ b/gdb/arm-linux-tdep.c @@ -18,45 +18,43 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" +#include "target.h" +#include "value.h" +#include "gdbtypes.h" +#include "gdbcore.h" +#include "frame.h" +#include "regcache.h" +#include "solib-svr4.h" +#include "osabi.h" +#include "regset.h" +#include "trad-frame.h" +#include "tramp-frame.h" +#include "breakpoint.h" +#include "auxv.h" +#include "xml-syscall.h" -/* Standard C includes. */ -#include <ctype.h> - -/* Local non-gdb includes. */ -#include "arch-utils.h" +#include "arch/arm.h" #include "arch/arm-get-next-pcs.h" #include "arch/arm-linux.h" -#include "arch/arm.h" -#include "arm-linux-tdep.h" #include "arm-tdep.h" -#include "auxv.h" -#include "breakpoint.h" -#include "cli/cli-utils.h" -#include "elf/common.h" -#include "frame.h" -#include "gdbcore.h" -#include "gdbthread.h" -#include "gdbtypes.h" +#include "arm-linux-tdep.h" +#include "linux-tdep.h" #include "glibc-tdep.h" +#include "arch-utils.h" #include "inferior.h" #include "infrun.h" -#include "linux-record.h" -#include "linux-tdep.h" -#include "osabi.h" -#include "parser-defs.h" +#include "gdbthread.h" +#include "symfile.h" + #include "record-full.h" -#include "regcache.h" -#include "regset.h" -#include "solib-svr4.h" +#include "linux-record.h" + +#include "cli/cli-utils.h" #include "stap-probe.h" -#include "symfile.h" -#include "target.h" -#include "trad-frame.h" -#include "tramp-frame.h" +#include "parser-defs.h" #include "user-regs.h" -#include "value.h" -#include "xml-syscall.h" - +#include <ctype.h> +#include "elf/common.h" extern int arm_apcs_32; /* Under ARM GNU/Linux the traditional way of performing a breakpoint diff --git a/gdb/arm-nbsd-nat.c b/gdb/arm-nbsd-nat.c index 09f4f0f1c47..2a83553a3fe 100644 --- a/gdb/arm-nbsd-nat.c +++ b/gdb/arm-nbsd-nat.c @@ -18,20 +18,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C includes. */ -#include <machine/frame.h> -#include <machine/reg.h> -#include <sys/ptrace.h> -#include <sys/types.h> - -/* Local non-gdb includes. */ -#include "arm-tdep.h" #include "gdbcore.h" -#include "inf-ptrace.h" #include "inferior.h" #include "regcache.h" #include "target.h" +#include <sys/types.h> +#include <sys/ptrace.h> +#include <machine/reg.h> +#include <machine/frame.h> + +#include "arm-tdep.h" +#include "inf-ptrace.h" class arm_netbsd_nat_target final : public inf_ptrace_target { diff --git a/gdb/arm-nbsd-tdep.c b/gdb/arm-nbsd-tdep.c index 2a13badbcdd..6b782300920 100644 --- a/gdb/arm-nbsd-tdep.c +++ b/gdb/arm-nbsd-tdep.c @@ -18,11 +18,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" +#include "osabi.h" -/* Local non-gdb includes. */ #include "arch/arm.h" #include "arm-tdep.h" -#include "osabi.h" #include "solib-svr4.h" /* Description of the longjmp buffer. */ diff --git a/gdb/arm-obsd-tdep.c b/gdb/arm-obsd-tdep.c index 44d9d993cb6..a6055ab171d 100644 --- a/gdb/arm-obsd-tdep.c +++ b/gdb/arm-obsd-tdep.c @@ -18,15 +18,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "arm-tdep.h" -#include "obsd-tdep.h" #include "osabi.h" -#include "solib-svr4.h" #include "trad-frame.h" #include "tramp-frame.h" +#include "obsd-tdep.h" +#include "arm-tdep.h" +#include "solib-svr4.h" + /* Signal trampolines. */ static void diff --git a/gdb/arm-pikeos-tdep.c b/gdb/arm-pikeos-tdep.c index 250346f502b..21add740a40 100644 --- a/gdb/arm-pikeos-tdep.c +++ b/gdb/arm-pikeos-tdep.c @@ -16,10 +16,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "arm-tdep.h" #include "objfiles.h" +#include "arm-tdep.h" #include "osabi.h" /* The gdbarch_register_osabi handler for ARM PikeOS; it performs diff --git a/gdb/arm-symbian-tdep.c b/gdb/arm-symbian-tdep.c index e078655506d..71521de7a91 100644 --- a/gdb/arm-symbian-tdep.c +++ b/gdb/arm-symbian-tdep.c @@ -18,15 +18,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "elf-bfd.h" #include "frame.h" #include "objfiles.h" #include "osabi.h" -#include "solib-target.h" #include "solib.h" +#include "solib-target.h" #include "target.h" +#include "elf-bfd.h" /* If PC is in a DLL import stub, return the address of the `real' function belonging to the stub. */ diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 07280cfb1b2..599f785b349 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -19,54 +19,55 @@ #include "defs.h" -/* Standard C includes. */ -#include <ctype.h> +#include <ctype.h> /* XXX for isupper (). */ -/* Standard C++ includes. */ -#include <algorithm> - -/* Local non-gdb includes. */ +#include "frame.h" +#include "inferior.h" +#include "infrun.h" +#include "gdbcmd.h" +#include "gdbcore.h" +#include "dis-asm.h" /* For register styles. */ +#include "disasm.h" +#include "regcache.h" +#include "reggroups.h" +#include "target-float.h" +#include "value.h" #include "arch-utils.h" -#include "arch/arm-get-next-pcs.h" +#include "osabi.h" +#include "frame-unwind.h" +#include "frame-base.h" +#include "trad-frame.h" +#include "objfiles.h" +#include "dwarf2-frame.h" +#include "gdbtypes.h" +#include "prologue-value.h" +#include "remote.h" +#include "target-descriptions.h" +#include "user-regs.h" +#include "observable.h" + #include "arch/arm.h" +#include "arch/arm-get-next-pcs.h" #include "arm-tdep.h" -#include "coff/internal.h" -#include "common/vec.h" -#include "dis-asm.h" -#include "disasm.h" -#include "dwarf2-frame.h" +#include "gdb/sim-arm.h" + #include "elf-bfd.h" +#include "coff/internal.h" #include "elf/arm.h" -#include "features/arm/arm-with-iwmmxt.c" + +#include "common/vec.h" + +#include "record.h" +#include "record-full.h" +#include <algorithm> + +#include "features/arm/arm-with-m.c" #include "features/arm/arm-with-m-fpa-layout.c" #include "features/arm/arm-with-m-vfp-d16.c" -#include "features/arm/arm-with-m.c" -#include "features/arm/arm-with-neon.c" +#include "features/arm/arm-with-iwmmxt.c" #include "features/arm/arm-with-vfpv2.c" #include "features/arm/arm-with-vfpv3.c" -#include "frame-base.h" -#include "frame-unwind.h" -#include "frame.h" -#include "gdb/sim-arm.h" -#include "gdbcmd.h" -#include "gdbcore.h" -#include "gdbtypes.h" -#include "inferior.h" -#include "infrun.h" -#include "objfiles.h" -#include "observable.h" -#include "osabi.h" -#include "prologue-value.h" -#include "record-full.h" -#include "record.h" -#include "regcache.h" -#include "reggroups.h" -#include "remote.h" -#include "target-descriptions.h" -#include "target-float.h" -#include "trad-frame.h" -#include "user-regs.h" -#include "value.h" +#include "features/arm/arm-with-neon.c" #if GDB_SELF_TEST #include "common/selftest.h" diff --git a/gdb/arm-wince-tdep.c b/gdb/arm-wince-tdep.c index 0ca6c813ae2..6eae60e8a7f 100644 --- a/gdb/arm-wince-tdep.c +++ b/gdb/arm-wince-tdep.c @@ -19,14 +19,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" +#include "osabi.h" +#include "gdbcore.h" +#include "target.h" +#include "frame.h" -/* Local non-gdb includes. */ #include "arch/arm.h" #include "arm-tdep.h" -#include "frame.h" -#include "gdbcore.h" -#include "osabi.h" -#include "target.h" #include "windows-tdep.h" static const gdb_byte arm_wince_le_breakpoint[] = { 0x10, 0x00, 0x00, 0xe6 }; diff --git a/gdb/auto-load.c b/gdb/auto-load.c index fd40cbb2de2..ae7a189dc04 100644 --- a/gdb/auto-load.c +++ b/gdb/auto-load.c @@ -18,35 +18,29 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C includes. */ #include <ctype.h> - -/* Standard C++ includes. */ -#include <algorithm> - -/* Local non-gdb includes. */ #include "auto-load.h" +#include "progspace.h" +#include "gdb_regex.h" +#include "ui-out.h" +#include "filenames.h" +#include "command.h" +#include "observable.h" +#include "objfiles.h" +#include "cli/cli-script.h" +#include "gdbcmd.h" #include "cli/cli-cmds.h" #include "cli/cli-decode.h" -#include "cli/cli-script.h" #include "cli/cli-setshow.h" -#include "command.h" -#include "common/filestuff.h" -#include "common/pathstuff.h" +#include "readline/tilde.h" #include "completer.h" -#include "extension.h" -#include "filenames.h" #include "fnmatch.h" -#include "gdb/section-scripts.h" -#include "gdb_regex.h" -#include "gdbcmd.h" -#include "objfiles.h" -#include "observable.h" -#include "progspace.h" -#include "readline/tilde.h" #include "top.h" -#include "ui-out.h" +#include "common/filestuff.h" +#include "extension.h" +#include "gdb/section-scripts.h" +#include <algorithm> +#include "common/pathstuff.h" /* The section to look in for auto-loaded scripts (in file formats that support sections). diff --git a/gdb/auxv.c b/gdb/auxv.c index e654abd3b3f..13caa936651 100644 --- a/gdb/auxv.c +++ b/gdb/auxv.c @@ -18,23 +18,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C includes. */ -#include <fcntl.h> -#include <unistd.h> - -/* Local non-gdb includes. */ -#include "auxv.h" -#include "command.h" -#include "common/filestuff.h" -#include "elf/common.h" -#include "gdbcore.h" +#include "target.h" #include "gdbtypes.h" +#include "command.h" #include "inferior.h" -#include "objfiles.h" -#include "observable.h" -#include "target.h" #include "valprint.h" +#include "gdbcore.h" +#include "observable.h" +#include "common/filestuff.h" +#include "objfiles.h" + +#include "auxv.h" +#include "elf/common.h" + +#include <unistd.h> +#include <fcntl.h> /* Implement the to_xfer_partial target_ops method. This function diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c index 64be41ad35f..6d11ee1618c 100644 --- a/gdb/avr-tdep.c +++ b/gdb/avr-tdep.c @@ -23,24 +23,20 @@ by Denis Chertykov, denisc@overta.ru */ #include "defs.h" - -/* Standard C++ includes. */ -#include <algorithm> - -/* Local non-gdb includes. */ -#include "arch-utils.h" -#include "dis-asm.h" -#include "frame-base.h" -#include "frame-unwind.h" #include "frame.h" +#include "frame-unwind.h" +#include "frame-base.h" +#include "trad-frame.h" #include "gdbcmd.h" #include "gdbcore.h" #include "gdbtypes.h" #include "inferior.h" -#include "objfiles.h" -#include "regcache.h" #include "symfile.h" -#include "trad-frame.h" +#include "arch-utils.h" +#include "regcache.h" +#include "dis-asm.h" +#include "objfiles.h" +#include <algorithm> /* AVR Background: diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c index 0783ab1fb9f..778e89515b6 100644 --- a/gdb/ax-gdb.c +++ b/gdb/ax-gdb.c @@ -18,36 +18,35 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "arch-utils.h" -#include "ax-gdb.h" +#include "symtab.h" +#include "symfile.h" +#include "gdbtypes.h" +#include "language.h" +#include "value.h" +#include "expression.h" +#include "command.h" +#include "gdbcmd.h" +#include "frame.h" +#include "target.h" #include "ax.h" +#include "ax-gdb.h" #include "block.h" +#include "regcache.h" +#include "user-regs.h" +#include "dictionary.h" #include "breakpoint.h" -#include "c-lang.h" -#include "cli/cli-utils.h" -#include "command.h" -#include "common/format.h" +#include "tracepoint.h" #include "cp-support.h" -#include "dictionary.h" -#include "expression.h" -#include "frame.h" -#include "gdbcmd.h" -#include "gdbtypes.h" -#include "language.h" +#include "arch-utils.h" +#include "cli/cli-utils.h" #include "linespec.h" #include "location.h" #include "objfiles.h" -#include "regcache.h" -#include "symfile.h" -#include "symtab.h" -#include "target.h" -#include "tracepoint.h" #include "typeprint.h" -#include "user-regs.h" #include "valprint.h" -#include "value.h" +#include "c-lang.h" + +#include "common/format.h" /* To make sense of this file, you should read doc/agentexpr.texi. Then look at the types and enums in ax-gdb.h. For the code itself, diff --git a/gdb/ax-gdb.h b/gdb/ax-gdb.h index 49ea26ec466..4420b654d88 100644 --- a/gdb/ax-gdb.h +++ b/gdb/ax-gdb.h @@ -19,7 +19,7 @@ #ifndef AX_GDB_H #define AX_GDB_H -#include "ax.h" +#include "ax.h" /* For agent_expr_up. */ struct expression; union exp_element; diff --git a/gdb/ax-general.c b/gdb/ax-general.c index c8499324f46..f956dfc2f53 100644 --- a/gdb/ax-general.c +++ b/gdb/ax-general.c @@ -22,11 +22,10 @@ outside of GDB (test suites, the stub, etc.) */ #include "defs.h" - -/* Local non-gdb includes. */ #include "ax.h" -#include "user-regs.h" + #include "value.h" +#include "user-regs.h" static void grow_expr (struct agent_expr *x, int n); diff --git a/gdb/bcache.c b/gdb/bcache.c index 37ca7c455a8..14a78474962 100644 --- a/gdb/bcache.c +++ b/gdb/bcache.c @@ -20,10 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "bcache.h" #include "gdb_obstack.h" +#include "bcache.h" /* The type used to hold a single bcache string. The user data is stored in d.data. Since it can be any type, it needs to have the diff --git a/gdb/bfd-target.c b/gdb/bfd-target.c index 15a9e6039fb..ffe85ae3e0e 100644 --- a/gdb/bfd-target.c +++ b/gdb/bfd-target.c @@ -18,12 +18,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ +#include "target.h" #include "bfd-target.h" #include "exec.h" #include "gdb_bfd.h" -#include "target.h" /* A target that wraps a BFD. */ diff --git a/gdb/bfin-linux-tdep.c b/gdb/bfin-linux-tdep.c index bfdc106fb67..3fc6b6a6586 100644 --- a/gdb/bfin-linux-tdep.c +++ b/gdb/bfin-linux-tdep.c @@ -20,16 +20,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ #include "arch-utils.h" -#include "bfin-tdep.h" -#include "linux-tdep.h" -#include "osabi.h" #include "regcache.h" -#include "trad-frame.h" #include "tramp-frame.h" +#include "trad-frame.h" +#include "osabi.h" #include "xml-syscall.h" +#include "linux-tdep.h" +#include "bfin-tdep.h" /* From <asm/sigcontext.h>. */ diff --git a/gdb/bfin-tdep.c b/gdb/bfin-tdep.c index 830cb1c2fd8..9d3e8ebce16 100644 --- a/gdb/bfin-tdep.c +++ b/gdb/bfin-tdep.c @@ -20,27 +20,25 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ +#include "inferior.h" +#include "gdbcore.h" #include "arch-utils.h" -#include "bfin-tdep.h" +#include "regcache.h" +#include "frame.h" +#include "frame-unwind.h" +#include "frame-base.h" +#include "trad-frame.h" #include "dis-asm.h" +#include "sim-regno.h" +#include "gdb/sim-bfin.h" #include "dwarf2-frame.h" +#include "symtab.h" #include "elf-bfd.h" #include "elf/bfin.h" -#include "frame-base.h" -#include "frame-unwind.h" -#include "frame.h" -#include "gdb/sim-bfin.h" -#include "gdbcore.h" -#include "infcall.h" -#include "inferior.h" #include "osabi.h" -#include "regcache.h" -#include "sim-regno.h" -#include "symtab.h" -#include "trad-frame.h" +#include "infcall.h" #include "xml-syscall.h" +#include "bfin-tdep.h" /* Macros used by prologue functions. */ #define P_LINKAGE 0xE800 diff --git a/gdb/block.c b/gdb/block.c index 366141c0333..63c7d9f3955 100644 --- a/gdb/block.c +++ b/gdb/block.c @@ -18,16 +18,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "addrmap.h" #include "block.h" -#include "cp-support.h" +#include "symtab.h" +#include "symfile.h" #include "gdb_obstack.h" +#include "cp-support.h" +#include "addrmap.h" #include "gdbtypes.h" #include "objfiles.h" -#include "symfile.h" -#include "symtab.h" /* This is used by struct block to store namespace-related info for C++ files, namely using declarations and the current namespace in diff --git a/gdb/blockframe.c b/gdb/blockframe.c index 8b1acab22f4..fe7807b87a6 100644 --- a/gdb/blockframe.c +++ b/gdb/blockframe.c @@ -19,23 +19,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "annotate.h" +#include "symtab.h" #include "bfd.h" -#include "block.h" -#include "command.h" -#include "dummy-frame.h" +#include "objfiles.h" #include "frame.h" -#include "gdbcmd.h" #include "gdbcore.h" +#include "value.h" +#include "target.h" #include "inferior.h" -#include "inline-frame.h" -#include "objfiles.h" +#include "annotate.h" #include "regcache.h" -#include "symtab.h" -#include "target.h" -#include "value.h" +#include "dummy-frame.h" +#include "command.h" +#include "gdbcmd.h" +#include "block.h" +#include "inline-frame.h" /* Return the innermost lexical block in execution in a specified stack frame. The frame address is assumed valid. diff --git a/gdb/break-catch-sig.c b/gdb/break-catch-sig.c index 14f901f07c2..53540ee8320 100644 --- a/gdb/break-catch-sig.c +++ b/gdb/break-catch-sig.c @@ -18,23 +18,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C includes. */ -#include <ctype.h> - -/* Standard C++ includes. */ -#include <string> - -/* Local non-gdb includes. */ -#include "annotate.h" #include "arch-utils.h" +#include <ctype.h> #include "breakpoint.h" -#include "cli/cli-utils.h" -#include "completer.h" #include "gdbcmd.h" #include "inferior.h" #include "infrun.h" +#include "annotate.h" #include "valprint.h" +#include "cli/cli-utils.h" +#include "completer.h" + +#include <string> #define INTERNAL_SIGNAL(x) ((x) == GDB_SIGNAL_TRAP || (x) == GDB_SIGNAL_INT) diff --git a/gdb/break-catch-syscall.c b/gdb/break-catch-syscall.c index 1d02e9b7b3a..6a911fbc2a3 100644 --- a/gdb/break-catch-syscall.c +++ b/gdb/break-catch-syscall.c @@ -18,20 +18,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C includes. */ #include <ctype.h> - -/* Local non-gdb includes. */ -#include "annotate.h" -#include "arch-utils.h" #include "breakpoint.h" -#include "cli/cli-utils.h" #include "gdbcmd.h" #include "inferior.h" +#include "cli/cli-utils.h" +#include "annotate.h" #include "mi/mi-common.h" -#include "observable.h" #include "valprint.h" +#include "arch-utils.h" +#include "observable.h" #include "xml-syscall.h" /* An instance of this type is used to represent a syscall catchpoint. diff --git a/gdb/break-catch-throw.c b/gdb/break-catch-throw.c index bad882f50fd..c8d66e0737c 100644 --- a/gdb/break-catch-throw.c +++ b/gdb/break-catch-throw.c @@ -18,28 +18,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C includes. */ -#include <ctype.h> - -/* Local non-gdb includes. */ -#include "annotate.h" #include "arch-utils.h" +#include <ctype.h> #include "breakpoint.h" +#include "gdbcmd.h" +#include "inferior.h" +#include "annotate.h" +#include "valprint.h" #include "cli/cli-utils.h" #include "completer.h" -#include "cp-abi.h" -#include "cp-support.h" #include "gdb_obstack.h" -#include "gdb_regex.h" -#include "gdbcmd.h" -#include "inferior.h" -#include "linespec.h" -#include "location.h" #include "mi/mi-common.h" -#include "objfiles.h" +#include "linespec.h" #include "probe.h" -#include "valprint.h" +#include "objfiles.h" +#include "cp-abi.h" +#include "gdb_regex.h" +#include "cp-support.h" +#include "location.h" /* Enums for exception-handling support. */ enum exception_event_kind diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index ed6833565e5..7799d1c1b48 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -18,62 +18,58 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C includes. */ -#include <ctype.h> - -/* Local non-gdb includes. */ -#include "ada-lang.h" -#include "annotate.h" #include "arch-utils.h" -#include "ax-gdb.h" -#include "block.h" +#include <ctype.h> +#include "hashtab.h" +#include "symtab.h" +#include "frame.h" #include "breakpoint.h" -#include "cli/cli-script.h" -#include "cli/cli-style.h" -#include "cli/cli-utils.h" -#include "command.h" -#include "common/format.h" -#include "completer.h" -#include "continuations.h" -#include "dummy-frame.h" +#include "tracepoint.h" +#include "gdbtypes.h" #include "expression.h" -#include "filenames.h" -#include "frame.h" -#include "gdb-demangle.h" -#include "gdb_regex.h" -#include "gdbcmd.h" #include "gdbcore.h" -#include "gdbthread.h" -#include "gdbtypes.h" -#include "hashtab.h" +#include "gdbcmd.h" +#include "value.h" +#include "command.h" #include "inferior.h" #include "infrun.h" -#include "interps.h" -#include "jit.h" +#include "gdbthread.h" +#include "target.h" #include "language.h" -#include "linespec.h" -#include "memattr.h" -#include "mi/mi-main.h" +#include "gdb-demangle.h" +#include "filenames.h" +#include "annotate.h" +#include "symfile.h" #include "objfiles.h" +#include "source.h" +#include "linespec.h" +#include "completer.h" +#include "ui-out.h" +#include "cli/cli-script.h" +#include "block.h" +#include "solib.h" +#include "solist.h" #include "observable.h" +#include "memattr.h" +#include "ada-lang.h" +#include "top.h" +#include "valprint.h" +#include "jit.h" #include "parser-defs.h" +#include "gdb_regex.h" #include "probe.h" -#include "skip.h" -#include "solib.h" -#include "solist.h" -#include "source.h" +#include "cli/cli-utils.h" +#include "continuations.h" #include "stack.h" -#include "symfile.h" -#include "symtab.h" -#include "target.h" +#include "skip.h" +#include "ax-gdb.h" +#include "dummy-frame.h" +#include "interps.h" +#include "common/format.h" #include "thread-fsm.h" #include "tid-parse.h" -#include "top.h" -#include "tracepoint.h" -#include "ui-out.h" -#include "valprint.h" -#include "value.h" +#include "cli/cli-style.h" +#include "mi/mi-main.h" /* readline include files */ #include "readline/readline.h" diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 3221719b889..a91e3e334cf 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -19,19 +19,17 @@ #if !defined (BREAKPOINT_H) #define BREAKPOINT_H 1 -#include <vector> - -/* Local non-gdb includes. */ +#include "frame.h" +#include "value.h" +#include "common/vec.h" #include "ax.h" -#include "cli/cli-script.h" #include "command.h" -#include "common/array-view.h" #include "common/break-common.h" -#include "common/vec.h" -#include "frame.h" -#include "location.h" #include "probe.h" -#include "value.h" +#include "location.h" +#include <vector> +#include "common/array-view.h" +#include "cli/cli-script.h" struct block; struct gdbpy_breakpoint_object; diff --git a/gdb/bsd-uthread.c b/gdb/bsd-uthread.c index a4cc3c9c4fa..af048f7a18f 100644 --- a/gdb/bsd-uthread.c +++ b/gdb/bsd-uthread.c @@ -18,10 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "bsd-uthread.h" -#include "gdb_obstack.h" #include "gdbcore.h" #include "gdbthread.h" #include "inferior.h" @@ -33,6 +29,10 @@ #include "symfile.h" #include "target.h" +#include "gdb_obstack.h" + +#include "bsd-uthread.h" + static const target_info bsd_uthread_target_info = { "bsd-uthreads", N_("BSD user-level threads"), diff --git a/gdb/btrace.c b/gdb/btrace.c index bb8eb26b7a2..12af46814a9 100644 --- a/gdb/btrace.c +++ b/gdb/btrace.c @@ -20,22 +20,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ #include "btrace.h" -#include "cli/cli-utils.h" -#include "common/rsp-low.h" -#include "disasm.h" -#include "filenames.h" -#include "gdbcmd.h" #include "gdbthread.h" #include "inferior.h" +#include "target.h" #include "record.h" -#include "regcache.h" -#include "source.h" #include "symtab.h" -#include "target.h" +#include "disasm.h" +#include "source.h" +#include "filenames.h" #include "xml-support.h" +#include "regcache.h" +#include "common/rsp-low.h" +#include "gdbcmd.h" +#include "cli/cli-utils.h" /* For maintenance commands. */ #include "record-btrace.h" diff --git a/gdb/build-id.c b/gdb/build-id.c index e21ee294a70..27f29cd0442 100644 --- a/gdb/build-id.c +++ b/gdb/build-id.c @@ -18,16 +18,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ #include "bfd.h" +#include "gdb_bfd.h" #include "build-id.h" #include "common/gdb_vecs.h" +#include "symfile.h" +#include "objfiles.h" #include "filenames.h" -#include "gdb_bfd.h" #include "gdbcore.h" -#include "objfiles.h" -#include "symfile.h" /* See build-id.h. */ diff --git a/gdb/build-id.h b/gdb/build-id.h index 478410b5954..b8b033e62aa 100644 --- a/gdb/build-id.h +++ b/gdb/build-id.h @@ -20,8 +20,8 @@ #ifndef BUILD_ID_H #define BUILD_ID_H -#include "common/rsp-low.h" #include "gdb_bfd.h" +#include "common/rsp-low.h" /* Locate NT_GNU_BUILD_ID from ABFD and return its content. */ diff --git a/gdb/buildsym-legacy.c b/gdb/buildsym-legacy.c index 7327db7693e..a29c1280971 100644 --- a/gdb/buildsym-legacy.c +++ b/gdb/buildsym-legacy.c @@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ #include "buildsym-legacy.h" /* The work-in-progress of the compunit we are building. diff --git a/gdb/buildsym.c b/gdb/buildsym.c index 50f0f42e471..9a23c8f5254 100644 --- a/gdb/buildsym.c +++ b/gdb/buildsym.c @@ -17,27 +17,23 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C++ includes. */ -#include <algorithm> - -/* Local non-gdb includes. */ -#include "addrmap.h" -#include "bfd.h" -#include "block.h" #include "buildsym-legacy.h" -#include "complaints.h" -#include "cp-support.h" -#include "demangle.h" -#include "dictionary.h" -#include "expression.h" -#include "filenames.h" +#include "bfd.h" #include "gdb_obstack.h" +#include "symtab.h" +#include "symfile.h" +#include "objfiles.h" #include "gdbtypes.h" +#include "complaints.h" +#include "expression.h" /* For "enum exp_opcode" used by... */ +#include "filenames.h" /* For DOSish file names. */ #include "macrotab.h" -#include "objfiles.h" -#include "symfile.h" -#include "symtab.h" +#include "demangle.h" /* Needed by SYMBOL_INIT_DEMANGLED_NAME. */ +#include "block.h" +#include "cp-support.h" +#include "dictionary.h" +#include "addrmap.h" +#include <algorithm> /* For cleanup_undefined_stabs_types and finish_global_stabs (somewhat questionable--see comment where we call them). */ diff --git a/gdb/c-lang.c b/gdb/c-lang.c index 0438f4bd088..36c750204da 100644 --- a/gdb/c-lang.c +++ b/gdb/c-lang.c @@ -18,27 +18,23 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C includes. */ -#include <ctype.h> - -/* Local non-gdb includes. */ +#include "symtab.h" +#include "gdbtypes.h" +#include "expression.h" +#include "parser-defs.h" +#include "language.h" +#include "varobj.h" #include "c-lang.h" #include "c-support.h" +#include "valprint.h" +#include "macroscope.h" #include "charset.h" +#include "demangle.h" #include "cp-abi.h" #include "cp-support.h" -#include "demangle.h" -#include "expression.h" #include "gdb_obstack.h" +#include <ctype.h> #include "gdbcore.h" -#include "gdbtypes.h" -#include "language.h" -#include "macroscope.h" -#include "parser-defs.h" -#include "symtab.h" -#include "valprint.h" -#include "varobj.h" /* Given a C string type, STR_TYPE, return the corresponding target character set name. */ diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c index f8e02c27963..6690ca53bcd 100644 --- a/gdb/c-typeprint.c +++ b/gdb/c-typeprint.c @@ -17,23 +17,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "bfd.h" -#include "c-lang.h" -#include "cli/cli-style.h" -#include "cp-abi.h" -#include "cp-support.h" -#include "demangle.h" -#include "expression.h" #include "gdb_obstack.h" -#include "gdbcore.h" -#include "gdbtypes.h" -#include "language.h" +#include "bfd.h" /* Binary File Description. */ #include "symtab.h" +#include "gdbtypes.h" +#include "expression.h" +#include "value.h" +#include "gdbcore.h" #include "target.h" +#include "language.h" +#include "demangle.h" +#include "c-lang.h" +#include "cli/cli-style.h" #include "typeprint.h" -#include "value.h" +#include "cp-abi.h" +#include "cp-support.h" /* A list of access specifiers used for printing. */ diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c index d2b07d08db2..c4306f1488f 100644 --- a/gdb/c-valprint.c +++ b/gdb/c-valprint.c @@ -18,19 +18,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "c-lang.h" -#include "cp-abi.h" -#include "expression.h" +#include "symtab.h" #include "gdbtypes.h" +#include "expression.h" +#include "value.h" +#include "valprint.h" #include "language.h" -#include "objfiles.h" -#include "symtab.h" +#include "c-lang.h" +#include "cp-abi.h" #include "target.h" -#include "valprint.h" -#include "value.h" - +#include "objfiles.h" /* A helper for c_textual_element_type. This checks the name of the diff --git a/gdb/c-varobj.c b/gdb/c-varobj.c index bcbc1537e12..2d247745c04 100644 --- a/gdb/c-varobj.c +++ b/gdb/c-varobj.c @@ -16,12 +16,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "gdbthread.h" -#include "valprint.h" #include "value.h" #include "varobj.h" +#include "gdbthread.h" +#include "valprint.h" static void cplus_class_num_children (struct type *type, int children[3]); diff --git a/gdb/charset.c b/gdb/charset.c index 505ccd35f85..5d8a9966031 100644 --- a/gdb/charset.c +++ b/gdb/charset.c @@ -18,20 +18,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C includes. */ -#include <ctype.h> - -/* Local non-gdb includes. */ -#include "arch-utils.h" -#include "charset-list.h" #include "charset.h" -#include "common/environ.h" -#include "common/gdb_vecs.h" +#include "gdbcmd.h" +#include "gdb_obstack.h" #include "common/gdb_wait.h" +#include "charset-list.h" #include "common/vec.h" -#include "gdb_obstack.h" -#include "gdbcmd.h" +#include "common/environ.h" +#include "arch-utils.h" +#include "common/gdb_vecs.h" +#include <ctype.h> #ifdef USE_WIN32API #include <windows.h> diff --git a/gdb/cli-out.c b/gdb/cli-out.c index 4665da4ebb3..55c8d2b3b1b 100644 --- a/gdb/cli-out.c +++ b/gdb/cli-out.c @@ -21,13 +21,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ +#include "ui-out.h" #include "cli-out.h" -#include "cli/cli-style.h" #include "completer.h" #include "readline/readline.h" -#include "ui-out.h" +#include "cli/cli-style.h" /* These are the CLI output functions */ diff --git a/gdb/cli-out.h b/gdb/cli-out.h index 995d14dd4a2..eeb555fbbec 100644 --- a/gdb/cli-out.h +++ b/gdb/cli-out.h @@ -20,10 +20,8 @@ #ifndef CLI_OUT_H #define CLI_OUT_H -#include <vector> - -/* Local non-gdb includes. */ #include "ui-out.h" +#include <vector> class cli_ui_out : public ui_out { diff --git a/gdb/coff-pe-read.c b/gdb/coff-pe-read.c index 06da8411ff1..f5721382f4c 100644 --- a/gdb/coff-pe-read.c +++ b/gdb/coff-pe-read.c @@ -23,20 +23,20 @@ #include "defs.h" -/* Standard C includes. */ -#include <ctype.h> +#include "coff-pe-read.h" -/* Local non-gdb includes. */ #include "bfd.h" -#include "coff-pe-read.h" -#include "coff/internal.h" +#include "gdbtypes.h" + #include "command.h" -#include "common/common-utils.h" #include "gdbcmd.h" -#include "gdbtypes.h" -#include "objfiles.h" -#include "symfile.h" #include "symtab.h" +#include "symfile.h" +#include "objfiles.h" +#include "common/common-utils.h" +#include "coff/internal.h" + +#include <ctype.h> /* Internal section information */ diff --git a/gdb/coffread.c b/gdb/coffread.c index ae0d05bddf3..4354741ab64 100644 --- a/gdb/coffread.c +++ b/gdb/coffread.c @@ -18,30 +18,30 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" +#include "symtab.h" +#include "gdbtypes.h" +#include "demangle.h" +#include "breakpoint.h" -/* Standard C includes. */ +#include "bfd.h" +#include "gdb_obstack.h" #include <ctype.h> -/* Local non-gdb includes. */ -#include "bfd.h" -#include "block.h" -#include "breakpoint.h" -#include "build-id.h" +#include "coff/internal.h" /* Internal format of COFF symbols in BFD */ +#include "libcoff.h" /* FIXME secret internal data from BFD */ +#include "objfiles.h" #include "buildsym-legacy.h" -#include "coff-pe-read.h" -#include "coff/internal.h" -#include "complaints.h" -#include "demangle.h" -#include "dictionary.h" #include "gdb-stabs.h" -#include "gdb_obstack.h" -#include "gdbtypes.h" -#include "libcoff.h" -#include "objfiles.h" -#include "psymtab.h" #include "stabsread.h" -#include "symtab.h" +#include "complaints.h" #include "target.h" +#include "block.h" +#include "dictionary.h" + +#include "coff-pe-read.h" + +#include "psymtab.h" +#include "build-id.h" /* Key for COFF-associated data. */ diff --git a/gdb/complaints.c b/gdb/complaints.c index b1422076989..c5b5471ee18 100644 --- a/gdb/complaints.c +++ b/gdb/complaints.c @@ -18,14 +18,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C++ includes. */ -#include <unordered_map> - -/* Local non-gdb includes. */ -#include "command.h" #include "complaints.h" +#include "command.h" #include "gdbcmd.h" +#include <unordered_map> /* Map format strings to counters. */ diff --git a/gdb/completer.c b/gdb/completer.c index ae7999926fd..d7cf4fd1203 100644 --- a/gdb/completer.c +++ b/gdb/completer.c @@ -17,24 +17,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C++ includes. */ -#include <algorithm> - -/* Local non-gdb includes. */ -#include "arch-utils.h" -#include "cli/cli-decode.h" -#include "common/gdb_signals.h" -#include "expression.h" -#include "filenames.h" +#include "symtab.h" #include "gdbtypes.h" +#include "expression.h" +#include "filenames.h" /* For DOSish file names. */ #include "language.h" -#include "linespec.h" -#include "location.h" -#include "reggroups.h" -#include "symtab.h" +#include "common/gdb_signals.h" #include "target.h" +#include "reggroups.h" #include "user-regs.h" +#include "arch-utils.h" +#include "location.h" +#include <algorithm> +#include "linespec.h" +#include "cli/cli-decode.h" /* FIXME: This is needed because of lookup_cmd_1 (). We should be calling a hook instead so we eliminate the CLI dependency. */ diff --git a/gdb/completer.h b/gdb/completer.h index 282e954a4e8..52f8d7dff4f 100644 --- a/gdb/completer.h +++ b/gdb/completer.h @@ -17,8 +17,8 @@ #if !defined (COMPLETER_H) #define COMPLETER_H 1 -#include "command.h" #include "common/gdb_vecs.h" +#include "command.h" /* Types of functions in struct match_list_displayer. */ diff --git a/gdb/continuations.c b/gdb/continuations.c index 3f565a8f810..1feee32ebaa 100644 --- a/gdb/continuations.c +++ b/gdb/continuations.c @@ -18,11 +18,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "continuations.h" #include "gdbthread.h" #include "inferior.h" +#include "continuations.h" struct continuation { diff --git a/gdb/corefile.c b/gdb/corefile.c index 7a99a4d79dc..bf859fbbb8d 100644 --- a/gdb/corefile.c +++ b/gdb/corefile.c @@ -18,24 +18,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C includes. */ -#include <fcntl.h> #include <signal.h> -#include <sys/stat.h> - -/* Local non-gdb includes. */ -#include "bfd.h" -#include "cli/cli-utils.h" +#include <fcntl.h> +#include "inferior.h" +#include "symtab.h" #include "command.h" -#include "completer.h" -#include "dis-asm.h" #include "gdbcmd.h" +#include "bfd.h" +#include "target.h" #include "gdbcore.h" -#include "inferior.h" +#include "dis-asm.h" +#include <sys/stat.h> +#include "completer.h" #include "observable.h" -#include "symtab.h" -#include "target.h" +#include "cli/cli-utils.h" /* You can have any number of hooks for `exec_file_command' command to call. If there's only one hook, it is set in exec_file_display diff --git a/gdb/corelow.c b/gdb/corelow.c index e7f164f4f27..7fb42970de4 100644 --- a/gdb/corelow.c +++ b/gdb/corelow.c @@ -18,35 +18,31 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C includes. */ -#include <fcntl.h> -#include <signal.h> - -/* Local non-gdb includes. */ #include "arch-utils.h" -#include "bfd.h" -#include "command.h" -#include "common/filestuff.h" -#include "completer.h" -#include "exec.h" -#include "filenames.h" -#include "frame.h" -#include "gdb_bfd.h" -#include "gdbcore.h" -#include "gdbthread.h" +#include <signal.h> +#include <fcntl.h> +#include "frame.h" /* required by inferior.h */ #include "inferior.h" #include "infrun.h" -#include "objfiles.h" +#include "symtab.h" +#include "command.h" +#include "bfd.h" +#include "target.h" #include "process-stratum-target.h" -#include "progspace.h" -#include "readline/readline.h" +#include "gdbcore.h" +#include "gdbthread.h" #include "regcache.h" #include "regset.h" -#include "solib.h" #include "symfile.h" -#include "symtab.h" -#include "target.h" +#include "exec.h" +#include "readline/readline.h" +#include "solib.h" +#include "filenames.h" +#include "progspace.h" +#include "objfiles.h" +#include "gdb_bfd.h" +#include "completer.h" +#include "common/filestuff.h" #ifndef O_LARGEFILE #define O_LARGEFILE 0 diff --git a/gdb/cp-abi.c b/gdb/cp-abi.c index 07db7effbb9..b858b190668 100644 --- a/gdb/cp-abi.c +++ b/gdb/cp-abi.c @@ -18,14 +18,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "command.h" +#include "value.h" #include "cp-abi.h" +#include "command.h" #include "gdbcmd.h" #include "ui-out.h" -#include "value.h" - static struct cp_abi_ops *find_cp_abi (const char *short_name); static struct cp_abi_ops current_cp_abi = { "", NULL }; diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c index 574ae7e9334..5b352d1d77b 100644 --- a/gdb/cp-namespace.c +++ b/gdb/cp-namespace.c @@ -19,24 +19,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C++ includes. */ -#include <string> - -/* Local non-gdb includes. */ -#include "block.h" -#include "buildsym.h" -#include "command.h" #include "cp-support.h" -#include "dictionary.h" -#include "frame.h" #include "gdb_obstack.h" +#include "symtab.h" +#include "symfile.h" +#include "block.h" +#include "objfiles.h" #include "gdbtypes.h" +#include "dictionary.h" +#include "command.h" +#include "frame.h" +#include "buildsym.h" #include "language.h" #include "namespace.h" -#include "objfiles.h" -#include "symfile.h" -#include "symtab.h" +#include <string> static struct block_symbol cp_lookup_nested_symbol_1 (struct type *container_type, diff --git a/gdb/cp-support.c b/gdb/cp-support.c index 9970f0ca864..b79dd5c086f 100644 --- a/gdb/cp-support.c +++ b/gdb/cp-support.c @@ -19,28 +19,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C includes. */ -#include <signal.h> - -/* Local non-gdb includes. */ -#include "block.h" -#include "common/gdb_setjmp.h" -#include "common/selftest.h" -#include "complaints.h" -#include "cp-abi.h" #include "cp-support.h" #include "demangle.h" +#include "gdbcmd.h" #include "dictionary.h" -#include "expression.h" +#include "objfiles.h" #include "frame.h" -#include "gdbcmd.h" +#include "symtab.h" +#include "block.h" +#include "complaints.h" #include "gdbtypes.h" +#include "expression.h" +#include "value.h" +#include "cp-abi.h" #include "namespace.h" -#include "objfiles.h" +#include <signal.h> +#include "common/gdb_setjmp.h" #include "safe-ctype.h" -#include "symtab.h" -#include "value.h" +#include "common/selftest.h" #define d_left(dc) (dc)->u.s_binary.left #define d_right(dc) (dc)->u.s_binary.right diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c index f6e7e538679..443c3b06dac 100644 --- a/gdb/cp-valprint.c +++ b/gdb/cp-valprint.c @@ -18,26 +18,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ +#include "gdb_obstack.h" +#include "symtab.h" +#include "gdbtypes.h" +#include "expression.h" +#include "value.h" +#include "command.h" +#include "gdbcmd.h" +#include "demangle.h" #include "annotate.h" #include "c-lang.h" -#include "command.h" -#include "common/byte-vector.h" +#include "target.h" #include "cp-abi.h" +#include "valprint.h" #include "cp-support.h" -#include "demangle.h" -#include "expression.h" -#include "extension.h" -#include "gdb_obstack.h" -#include "gdbcmd.h" -#include "gdbtypes.h" #include "language.h" -#include "symtab.h" -#include "target.h" +#include "extension.h" #include "typeprint.h" -#include "valprint.h" -#include "value.h" +#include "common/byte-vector.h" /* Controls printing of vtbl's. */ static void diff --git a/gdb/cris-linux-tdep.c b/gdb/cris-linux-tdep.c index 8f765b5060f..27681cb8b27 100644 --- a/gdb/cris-linux-tdep.c +++ b/gdb/cris-linux-tdep.c @@ -22,14 +22,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "cris-tdep.h" -#include "linux-tdep.h" #include "osabi.h" +#include "linux-tdep.h" #include "solib-svr4.h" #include "symtab.h" +#include "cris-tdep.h" + static void cris_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c index a41335ded66..8eda05806f8 100644 --- a/gdb/cris-tdep.c +++ b/gdb/cris-tdep.c @@ -21,29 +21,30 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "arch-utils.h" -#include "cris-tdep.h" -#include "dis-asm.h" -#include "dwarf2-frame.h" -#include "frame-base.h" -#include "frame-unwind.h" #include "frame.h" -#include "gdbcmd.h" -#include "gdbcore.h" -#include "gdbtypes.h" +#include "frame-unwind.h" +#include "frame-base.h" +#include "trad-frame.h" +#include "dwarf2-frame.h" +#include "symtab.h" #include "inferior.h" -#include "objfiles.h" +#include "gdbtypes.h" +#include "gdbcore.h" +#include "gdbcmd.h" +#include "target.h" +#include "value.h" #include "opcode/cris.h" #include "osabi.h" +#include "arch-utils.h" #include "regcache.h" + +#include "objfiles.h" + +#include "solib.h" /* Support for shared libraries. */ #include "solib-svr4.h" -#include "solib.h" -#include "symtab.h" -#include "target.h" -#include "trad-frame.h" -#include "value.h" +#include "dis-asm.h" + +#include "cris-tdep.h" enum cris_num_regs { diff --git a/gdb/csky-linux-tdep.c b/gdb/csky-linux-tdep.c index 235d4dbcfb6..ab4af9f6f15 100644 --- a/gdb/csky-linux-tdep.c +++ b/gdb/csky-linux-tdep.c @@ -20,17 +20,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "csky-tdep.h" -#include "gdbarch.h" +#include "osabi.h" #include "glibc-tdep.h" #include "linux-tdep.h" -#include "osabi.h" -#include "regset.h" +#include "gdbarch.h" #include "solib-svr4.h" +#include "regset.h" #include "trad-frame.h" #include "tramp-frame.h" +#include "csky-tdep.h" /* Functions, definitions, and data structures for C-Sky core file debug. */ diff --git a/gdb/csky-tdep.c b/gdb/csky-tdep.c index cabc5e14918..cd7d8c5a0b1 100644 --- a/gdb/csky-tdep.c +++ b/gdb/csky-tdep.c @@ -20,47 +20,43 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C++ includes. */ -#include <algorithm> -#include <vector> - -/* Local non-gdb includes. */ -#include "arch-utils.h" -#include "block.h" #include "common/gdb_assert.h" -#include "csky-tdep.h" -#include "dis-asm.h" -#include "dwarf2-frame.h" -#include "elf-bfd.h" -#include "elf/csky.h" -#include "floatformat.h" -#include "frame-base.h" -#include "frame-unwind.h" #include "frame.h" -#include "gdbcmd.h" -#include "gdbcore.h" -#include "gdbtypes.h" -#include "infcall.h" #include "inferior.h" +#include "symtab.h" +#include "value.h" +#include "gdbcmd.h" #include "language.h" +#include "gdbcore.h" +#include "symfile.h" #include "objfiles.h" -#include "opcode/csky.h" -#include "osabi.h" +#include "gdbtypes.h" +#include "target.h" +#include "arch-utils.h" #include "regcache.h" +#include "osabi.h" +#include "block.h" #include "reggroups.h" -#include "regset.h" -#include "remote.h" -#include "sim-regno.h" +#include "elf/csky.h" +#include "elf-bfd.h" #include "symcat.h" -#include "symfile.h" -#include "symtab.h" -#include "target-descriptions.h" -#include "target.h" +#include "sim-regno.h" +#include "dis-asm.h" +#include "frame-unwind.h" +#include "frame-base.h" #include "trad-frame.h" +#include "infcall.h" +#include "floatformat.h" +#include "remote.h" +#include "target-descriptions.h" +#include "dwarf2-frame.h" #include "user-regs.h" #include "valprint.h" -#include "value.h" +#include "csky-tdep.h" +#include "regset.h" +#include "opcode/csky.h" +#include <algorithm> +#include <vector> /* Control debugging information emitted in this file. */ static int csky_debug = 0; diff --git a/gdb/ctf.c b/gdb/ctf.c index 6796931edf3..7a95df78152 100644 --- a/gdb/ctf.c +++ b/gdb/ctf.c @@ -20,24 +20,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C includes. */ -#include <ctype.h> -#include <sys/stat.h> - -/* Standard C++ includes. */ -#include <algorithm> - -/* Local non-gdb includes. */ -#include "common/filestuff.h" -#include "completer.h" #include "ctf.h" +#include "tracepoint.h" +#include "regcache.h" +#include <sys/stat.h> #include "exec.h" -#include "gdbthread.h" +#include "completer.h" #include "inferior.h" -#include "regcache.h" +#include "gdbthread.h" #include "tracefile.h" -#include "tracepoint.h" +#include <ctype.h> +#include <algorithm> +#include "common/filestuff.h" /* The CTF target. */ diff --git a/gdb/d-lang.c b/gdb/d-lang.c index 7fb6c52748e..637e012b32e 100644 --- a/gdb/d-lang.c +++ b/gdb/d-lang.c @@ -18,15 +18,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "c-lang.h" -#include "cp-support.h" -#include "d-lang.h" -#include "demangle.h" -#include "language.h" #include "symtab.h" +#include "language.h" #include "varobj.h" +#include "d-lang.h" +#include "c-lang.h" +#include "demangle.h" +#include "cp-support.h" /* The name of the symbol to use to get the name of the main subprogram. */ static const char D_MAIN[] = "D main"; diff --git a/gdb/d-namespace.c b/gdb/d-namespace.c index e5d4adf8df6..4edef188e9e 100644 --- a/gdb/d-namespace.c +++ b/gdb/d-namespace.c @@ -18,14 +18,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ +#include "symtab.h" #include "block.h" -#include "d-lang.h" -#include "gdb_obstack.h" #include "language.h" #include "namespace.h" -#include "symtab.h" +#include "d-lang.h" +#include "gdb_obstack.h" /* This returns the length of first component of NAME, which should be the demangled name of a D variable/function/method/etc. diff --git a/gdb/d-valprint.c b/gdb/d-valprint.c index 6d58ecaa622..54652364a8f 100644 --- a/gdb/d-valprint.c +++ b/gdb/d-valprint.c @@ -18,12 +18,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "c-lang.h" -#include "d-lang.h" -#include "gdbcore.h" #include "gdbtypes.h" +#include "gdbcore.h" +#include "d-lang.h" +#include "c-lang.h" /* Assuming that TYPE is a TYPE_CODE_STRUCT, verify that TYPE is a dynamic array, and then print its value to STREAM. Return zero if diff --git a/gdb/darwin-nat-info.c b/gdb/darwin-nat-info.c index 88ee027f71e..ca3b2e87252 100644 --- a/gdb/darwin-nat-info.c +++ b/gdb/darwin-nat-info.c @@ -28,25 +28,24 @@ Tiger is no longer important. */ #include "defs.h" +#include "symtab.h" +#include "gdbtypes.h" +#include "gdbcore.h" +#include "value.h" +#include "gdbcmd.h" +#include "inferior.h" -/* Standard C includes. */ -#include <mach/mach_init.h> -#include <mach/mach_port.h> -#include <mach/mach_vm.h> -#include <mach/task.h> -#include <mach/thread_act.h> -#include <mach/thread_info.h> -#include <mach/vm_map.h> #include <sys/sysctl.h> -/* Local non-gdb includes. */ #include "darwin-nat.h" -#include "gdbcmd.h" -#include "gdbcore.h" -#include "gdbtypes.h" -#include "inferior.h" -#include "symtab.h" -#include "value.h" + +#include <mach/thread_info.h> +#include <mach/thread_act.h> +#include <mach/task.h> +#include <mach/vm_map.h> +#include <mach/mach_port.h> +#include <mach/mach_init.h> +#include <mach/mach_vm.h> #define CHECK_ARGS(what, args) do { \ if ((NULL == args) || ((args[0] != '0') && (args[1] != 'x'))) \ diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c index ec9a313d599..6247b0656c9 100644 --- a/gdb/darwin-nat.c +++ b/gdb/darwin-nat.c @@ -19,56 +19,55 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" +#include "top.h" +#include "inferior.h" +#include "target.h" +#include "symfile.h" +#include "symtab.h" +#include "objfiles.h" +#include "gdbcmd.h" +#include "gdbcore.h" +#include "gdbthread.h" +#include "regcache.h" +#include "event-top.h" +#include "inf-loop.h" +#include <sys/stat.h> +#include "inf-child.h" +#include "value.h" +#include "arch-utils.h" +#include "bfd.h" +#include "bfd/mach-o.h" -/* Standard C includes. */ #include <copyfile.h> +#include <sys/ptrace.h> +#include <sys/signal.h> +#include <setjmp.h> +#include <sys/types.h> +#include <unistd.h> +#include <signal.h> #include <ctype.h> +#include <sys/sysctl.h> +#include <sys/proc.h> #include <libproc.h> +#include <sys/syscall.h> +#include <spawn.h> + #include <mach/mach_error.h> -#include <mach/mach_init.h> -#include <mach/mach_port.h> #include <mach/mach_vm.h> -#include <mach/port.h> +#include <mach/mach_init.h> +#include <mach/vm_map.h> #include <mach/task.h> +#include <mach/mach_port.h> #include <mach/thread_act.h> -#include <mach/vm_map.h> -#include <setjmp.h> -#include <signal.h> -#include <spawn.h> -#include <sys/proc.h> -#include <sys/ptrace.h> -#include <sys/signal.h> -#include <sys/stat.h> -#include <sys/syscall.h> -#include <sys/sysctl.h> -#include <sys/types.h> -#include <unistd.h> +#include <mach/port.h> -/* Local non-gdb includes. */ -#include "arch-utils.h" -#include "bfd.h" -#include "bfd/mach-o.h" +#include "darwin-nat.h" +#include "filenames.h" #include "common/filestuff.h" #include "common/gdb_unlinker.h" #include "common/pathstuff.h" #include "common/scoped_fd.h" -#include "darwin-nat.h" -#include "event-top.h" -#include "filenames.h" -#include "gdbcmd.h" -#include "gdbcore.h" -#include "gdbthread.h" -#include "inf-child.h" -#include "inf-loop.h" -#include "inferior.h" #include "nat/fork-inferior.h" -#include "objfiles.h" -#include "regcache.h" -#include "symfile.h" -#include "symtab.h" -#include "target.h" -#include "top.h" -#include "value.h" /* Quick overview. Darwin kernel is Mach + BSD derived kernel. Note that they share the diff --git a/gdb/darwin-nat.h b/gdb/darwin-nat.h index cd656b1e487..9091efd88f1 100644 --- a/gdb/darwin-nat.h +++ b/gdb/darwin-nat.h @@ -17,11 +17,9 @@ #ifndef DARWIN_NAT_H #define DARWIN_NAT_H +#include "inf-child.h" #include <mach/mach.h> - -/* Local non-gdb includes. */ #include "gdbthread.h" -#include "inf-child.h" /* This needs to be overridden by the platform specific nat code. */ diff --git a/gdb/dcache.c b/gdb/dcache.c index 6226ae477e1..5a2e8f8000b 100644 --- a/gdb/dcache.c +++ b/gdb/dcache.c @@ -18,14 +18,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ #include "dcache.h" #include "gdbcmd.h" #include "gdbcore.h" +#include "target-dcache.h" #include "inferior.h" #include "splay-tree.h" -#include "target-dcache.h" /* Commands with a prefix of `{set,show} dcache'. */ static struct cmd_list_element *dcache_set_list = NULL; diff --git a/gdb/dcache.h b/gdb/dcache.h index 97ed5362303..9c29074c919 100644 --- a/gdb/dcache.h +++ b/gdb/dcache.h @@ -21,7 +21,7 @@ #ifndef DCACHE_H #define DCACHE_H -#include "target.h" +#include "target.h" /* for enum target_xfer_status */ typedef struct dcache_struct DCACHE; diff --git a/gdb/demangle.c b/gdb/demangle.c index 8e5065a27b0..29f46968a29 100644 --- a/gdb/demangle.c +++ b/gdb/demangle.c @@ -24,13 +24,11 @@ to a styles of demangling, and GDB specific. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "cli/cli-utils.h" +#include "cli/cli-utils.h" /* for skip_to_space */ #include "command.h" +#include "gdbcmd.h" #include "demangle.h" #include "gdb-demangle.h" -#include "gdbcmd.h" #include "language.h" /* Select the default C++ demangling style to use. The default is "auto", diff --git a/gdb/dicos-tdep.c b/gdb/dicos-tdep.c index 48f11a55d31..bacba963685 100644 --- a/gdb/dicos-tdep.c +++ b/gdb/dicos-tdep.c @@ -18,13 +18,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "dicos-tdep.h" -#include "inferior.h" #include "osabi.h" -#include "solib-target.h" #include "solib.h" +#include "solib-target.h" +#include "inferior.h" +#include "dicos-tdep.h" void dicos_init_abi (struct gdbarch *gdbarch) diff --git a/gdb/dictionary.c b/gdb/dictionary.c index b4b544b3942..88eff2fa439 100644 --- a/gdb/dictionary.c +++ b/gdb/dictionary.c @@ -21,19 +21,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C includes. */ #include <ctype.h> - -/* Standard C++ includes. */ -#include <unordered_map> - -/* Local non-gdb includes. */ +#include "gdb_obstack.h" +#include "symtab.h" #include "buildsym.h" #include "dictionary.h" -#include "gdb_obstack.h" #include "safe-ctype.h" -#include "symtab.h" +#include <unordered_map> /* This file implements dictionaries, which are tables that associate symbols to names. They are represented by an opaque type 'struct diff --git a/gdb/disasm-selftests.c b/gdb/disasm-selftests.c index b12a99f6741..48b466baf13 100644 --- a/gdb/disasm-selftests.c +++ b/gdb/disasm-selftests.c @@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ #include "disasm.h" #if GDB_SELF_TEST diff --git a/gdb/disasm.c b/gdb/disasm.c index d989a8b7f50..7c7a148935e 100644 --- a/gdb/disasm.c +++ b/gdb/disasm.c @@ -18,23 +18,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C++ includes. */ -#include <algorithm> - -/* Local non-gdb includes. */ #include "arch-utils.h" -#include "common/gdb_optional.h" -#include "dis-asm.h" +#include "target.h" +#include "value.h" +#include "ui-out.h" #include "disasm.h" -#include "gdbcmd.h" #include "gdbcore.h" -#include "safe-ctype.h" +#include "gdbcmd.h" +#include "dis-asm.h" #include "source.h" -#include "target.h" -#include "ui-out.h" +#include "safe-ctype.h" +#include <algorithm> +#include "common/gdb_optional.h" #include "valprint.h" -#include "value.h" /* Disassemble functions. FIXME: We should get rid of all the duplicate code in gdb that does diff --git a/gdb/disasm.h b/gdb/disasm.h index 39d838195bd..d3cc6312093 100644 --- a/gdb/disasm.h +++ b/gdb/disasm.h @@ -19,8 +19,8 @@ #ifndef DISASM_H #define DISASM_H -#include "common/enum-flags.h" #include "dis-asm.h" +#include "common/enum-flags.h" enum gdb_disassembly_flag { diff --git a/gdb/dtrace-probe.c b/gdb/dtrace-probe.c index 0114c401af1..bd5cddcf804 100644 --- a/gdb/dtrace-probe.c +++ b/gdb/dtrace-probe.c @@ -20,21 +20,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "ax-gdb.h" -#include "ax.h" +#include "probe.h" #include "common/vec.h" -#include "complaints.h" #include "elf-bfd.h" #include "gdbtypes.h" -#include "inferior.h" -#include "language.h" -#include "objfiles.h" #include "obstack.h" -#include "parser-defs.h" -#include "probe.h" +#include "objfiles.h" +#include "complaints.h" #include "value.h" +#include "ax.h" +#include "ax-gdb.h" +#include "language.h" +#include "parser-defs.h" +#include "inferior.h" /* The type of the ELF sections where we will find the DOF programs with information about probes. */ diff --git a/gdb/dummy-frame.c b/gdb/dummy-frame.c index 99d3d7c8bc3..aebdd233d74 100644 --- a/gdb/dummy-frame.c +++ b/gdb/dummy-frame.c @@ -19,18 +19,16 @@ #include "defs.h" - -/* Local non-gdb includes. */ -#include "command.h" #include "dummy-frame.h" -#include "frame-unwind.h" +#include "regcache.h" #include "frame.h" +#include "inferior.h" +#include "frame-unwind.h" +#include "command.h" #include "gdbcmd.h" +#include "observable.h" #include "gdbthread.h" #include "infcall.h" -#include "inferior.h" -#include "observable.h" -#include "regcache.h" struct dummy_frame_id { diff --git a/gdb/dwarf-index-cache.c b/gdb/dwarf-index-cache.c index 41340b8d8de..445f8b199e6 100644 --- a/gdb/dwarf-index-cache.c +++ b/gdb/dwarf-index-cache.c @@ -18,24 +18,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" +#include "dwarf-index-cache.h" -/* Standard C includes. */ -#include <stdlib.h> - -/* Standard C++ includes. */ -#include <string> - -/* Local non-gdb includes. */ #include "build-id.h" #include "cli/cli-cmds.h" #include "command.h" -#include "common/pathstuff.h" #include "common/scoped_mmap.h" -#include "common/selftest.h" -#include "dwarf-index-cache.h" +#include "common/pathstuff.h" #include "dwarf-index-write.h" #include "dwarf2read.h" #include "objfiles.h" +#include "common/selftest.h" +#include <string> +#include <stdlib.h> /* When set to 1, show debug messages about the index cache. */ static int debug_index_cache = 0; diff --git a/gdb/dwarf-index-cache.h b/gdb/dwarf-index-cache.h index 807cfea00b7..2f267632141 100644 --- a/gdb/dwarf-index-cache.h +++ b/gdb/dwarf-index-cache.h @@ -20,8 +20,8 @@ #ifndef DWARF_INDEX_CACHE_H #define DWARF_INDEX_CACHE_H -#include "common/array-view.h" #include "dwarf-index-common.h" +#include "common/array-view.h" #include "symfile.h" /* Base of the classes used to hold the resources of the indices loaded from diff --git a/gdb/dwarf-index-common.c b/gdb/dwarf-index-common.c index 4a5ef6245f6..220d74881a0 100644 --- a/gdb/dwarf-index-common.c +++ b/gdb/dwarf-index-common.c @@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ #include "dwarf-index-common.h" /* See dwarf-index-common.h. */ diff --git a/gdb/dwarf-index-write.c b/gdb/dwarf-index-write.c index 0c4173c90ef..01c1256bcb6 100644 --- a/gdb/dwarf-index-write.c +++ b/gdb/dwarf-index-write.c @@ -19,14 +19,6 @@ #include "defs.h" -/* Standard C++ includes. */ -#include <algorithm> -#include <cmath> -#include <set> -#include <unordered_map> -#include <unordered_set> - -/* Local non-gdb includes. */ #include "addrmap.h" #include "cli/cli-decode.h" #include "common/byte-vector.h" @@ -43,6 +35,12 @@ #include "objfiles.h" #include "psympriv.h" +#include <algorithm> +#include <cmath> +#include <set> +#include <unordered_map> +#include <unordered_set> + /* Ensure only legit values are used. */ #define DW2_GDB_INDEX_SYMBOL_STATIC_SET_VALUE(cu_index, value) \ do { \ diff --git a/gdb/dwarf-index-write.h b/gdb/dwarf-index-write.h index 2d6248035a6..b1d1180c8e3 100644 --- a/gdb/dwarf-index-write.h +++ b/gdb/dwarf-index-write.h @@ -20,8 +20,8 @@ #ifndef DWARF_INDEX_WRITE_H #define DWARF_INDEX_WRITE_H -#include "dwarf2read.h" #include "symfile.h" +#include "dwarf2read.h" /* Create an index file for OBJFILE in the directory DIR. BASENAME is the desired filename, minus the extension, which gets added by this function diff --git a/gdb/dwarf2-frame-tailcall.c b/gdb/dwarf2-frame-tailcall.c index c4e9c0991fc..4cf7f5ff63a 100644 --- a/gdb/dwarf2-frame-tailcall.c +++ b/gdb/dwarf2-frame-tailcall.c @@ -18,18 +18,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "block.h" +#include "frame.h" #include "dwarf2-frame-tailcall.h" -#include "dwarf2-frame.h" #include "dwarf2loc.h" #include "frame-unwind.h" -#include "frame.h" -#include "gdbtypes.h" +#include "block.h" #include "hashtab.h" +#include "gdbtypes.h" #include "regcache.h" #include "value.h" +#include "dwarf2-frame.h" /* Contains struct tailcall_cache indexed by next_bottom_frame. */ static htab_t cache_htab; diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c index b657af2786c..178ac44ecbe 100644 --- a/gdb/dwarf2-frame.c +++ b/gdb/dwarf2-frame.c @@ -20,27 +20,25 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "ax.h" -#include "complaints.h" -#include "dwarf2-frame-tailcall.h" -#include "dwarf2-frame.h" -#include "dwarf2.h" #include "dwarf2expr.h" -#include "dwarf2loc.h" -#include "dwarf2read.h" +#include "dwarf2.h" +#include "frame.h" #include "frame-base.h" #include "frame-unwind.h" -#include "frame.h" #include "gdbcore.h" #include "gdbtypes.h" +#include "symtab.h" #include "objfiles.h" -#include "record.h" #include "regcache.h" -#include "symtab.h" #include "value.h" +#include "record.h" +#include "complaints.h" +#include "dwarf2-frame.h" +#include "dwarf2read.h" +#include "ax.h" +#include "dwarf2loc.h" +#include "dwarf2-frame-tailcall.h" #if GDB_SELF_TEST #include "common/selftest.h" #include "selftest-arch.h" diff --git a/gdb/dwarf2expr.c b/gdb/dwarf2expr.c index 17bec73149b..e412e182c01 100644 --- a/gdb/dwarf2expr.c +++ b/gdb/dwarf2expr.c @@ -20,16 +20,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "common/underlying.h" +#include "symtab.h" +#include "gdbtypes.h" +#include "value.h" +#include "gdbcore.h" #include "dwarf2.h" #include "dwarf2expr.h" #include "dwarf2loc.h" -#include "gdbcore.h" -#include "gdbtypes.h" -#include "symtab.h" -#include "value.h" +#include "common/underlying.h" /* Cookie for gdbarch data. */ diff --git a/gdb/dwarf2expr.h b/gdb/dwarf2expr.h index eb2259bfc44..c7cbf32d5e7 100644 --- a/gdb/dwarf2expr.h +++ b/gdb/dwarf2expr.h @@ -22,8 +22,8 @@ #if !defined (DWARF2EXPR_H) #define DWARF2EXPR_H -#include "gdbtypes.h" #include "leb128.h" +#include "gdbtypes.h" /* The location of a value. */ enum dwarf_value_location diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c index bac74461f9a..29d289b4d0c 100644 --- a/gdb/dwarf2loc.c +++ b/gdb/dwarf2loc.c @@ -20,34 +20,30 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C++ includes. */ -#include <algorithm> -#include <unordered_set> -#include <vector> - -/* Local non-gdb includes. */ -#include "ax-gdb.h" +#include "ui-out.h" +#include "value.h" +#include "frame.h" +#include "gdbcore.h" +#include "target.h" +#include "inferior.h" #include "ax.h" +#include "ax-gdb.h" +#include "regcache.h" +#include "objfiles.h" #include "block.h" -#include "common/byte-vector.h" -#include "common/selftest.h" -#include "common/underlying.h" -#include "compile/compile.h" +#include "gdbcmd.h" #include "complaints.h" -#include "dwarf2-frame.h" #include "dwarf2.h" #include "dwarf2expr.h" #include "dwarf2loc.h" -#include "frame.h" -#include "gdbcmd.h" -#include "gdbcore.h" -#include "inferior.h" -#include "objfiles.h" -#include "regcache.h" -#include "target.h" -#include "ui-out.h" -#include "value.h" +#include "dwarf2-frame.h" +#include "compile/compile.h" +#include "common/selftest.h" +#include <algorithm> +#include <vector> +#include <unordered_set> +#include "common/underlying.h" +#include "common/byte-vector.h" extern int dwarf_always_disassemble; diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index c10d9affce9..8881a1e28a8 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -29,73 +29,67 @@ E.g., load_partial_dies, read_partial_die. */ #include "defs.h" - -/* Standard C includes. */ -#include <ctype.h> -#include <fcntl.h> -#include <sys/stat.h> -#include <sys/types.h> - -/* Standard C++ includes. */ -#include <algorithm> -#include <cmath> -#include <forward_list> -#include <set> -#include <unordered_map> -#include <unordered_set> - -/* Local non-gdb includes. */ -#include "addrmap.h" -#include "bfd.h" -#include "block.h" -#include "build-id.h" -#include "buildsym.h" -#include "c-lang.h" -#include "command.h" -#include "common/byte-vector.h" -#include "common/filestuff.h" -#include "common/function-view.h" -#include "common/gdb_optional.h" -#include "common/gdb_unlinker.h" -#include "common/hash_enum.h" -#include "common/pathstuff.h" -#include "common/selftest.h" -#include "common/underlying.h" -#include "common/vec.h" -#include "complaints.h" -#include "completer.h" -#include "cp-support.h" -#include "demangle.h" +#include "dwarf2read.h" #include "dwarf-index-cache.h" #include "dwarf-index-common.h" +#include "bfd.h" +#include "elf-bfd.h" +#include "symtab.h" +#include "gdbtypes.h" +#include "objfiles.h" #include "dwarf2.h" +#include "buildsym.h" +#include "demangle.h" +#include "gdb-demangle.h" +#include "expression.h" +#include "filenames.h" /* for DOSish file names */ +#include "macrotab.h" +#include "language.h" +#include "complaints.h" #include "dwarf2expr.h" #include "dwarf2loc.h" -#include "dwarf2read.h" -#include "elf-bfd.h" -#include "expression.h" -#include "f-lang.h" -#include "filename-seen-cache.h" -#include "filenames.h" -#include "gdb-demangle.h" -#include "gdb/gdb-index.h" -#include "gdb_bfd.h" +#include "cp-support.h" +#include "hashtab.h" +#include "command.h" #include "gdbcmd.h" -#include "gdbcore.h" -#include "gdbtypes.h" +#include "block.h" +#include "addrmap.h" +#include "typeprint.h" +#include "psympriv.h" +#include <sys/stat.h> +#include "completer.h" +#include "common/vec.h" +#include "c-lang.h" #include "go-lang.h" -#include "hashtab.h" -#include "language.h" -#include "macrotab.h" +#include "valprint.h" +#include "gdbcore.h" /* for gnutarget */ +#include "gdb/gdb-index.h" +#include <ctype.h> +#include "gdb_bfd.h" +#include "f-lang.h" +#include "source.h" +#include "common/filestuff.h" +#include "build-id.h" #include "namespace.h" -#include "objfiles.h" +#include "common/gdb_unlinker.h" +#include "common/function-view.h" +#include "common/gdb_optional.h" +#include "common/underlying.h" +#include "common/byte-vector.h" +#include "common/hash_enum.h" +#include "filename-seen-cache.h" #include "producer.h" -#include "psympriv.h" +#include <fcntl.h> +#include <sys/types.h> +#include <algorithm> +#include <unordered_set> +#include <unordered_map> +#include "common/selftest.h" +#include <cmath> +#include <set> +#include <forward_list> #include "rust-lang.h" -#include "source.h" -#include "symtab.h" -#include "typeprint.h" -#include "valprint.h" +#include "common/pathstuff.h" /* When == 1, print basic high level tracing messages. When > 1, be more verbose. diff --git a/gdb/dwarf2read.h b/gdb/dwarf2read.h index 8845e99d6bf..34c66167b5b 100644 --- a/gdb/dwarf2read.h +++ b/gdb/dwarf2read.h @@ -21,8 +21,6 @@ #define DWARF2READ_H #include <unordered_map> - -/* Local non-gdb includes. */ #include "dwarf-index-cache.h" #include "filename-seen-cache.h" #include "gdb_obstack.h" diff --git a/gdb/elfread.c b/gdb/elfread.c index 6d67418fa0a..55a16bb2f8e 100644 --- a/gdb/elfread.c +++ b/gdb/elfread.c @@ -20,36 +20,34 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "arch-utils.h" -#include "auxv.h" -#include "bcache.h" #include "bfd.h" -#include "build-id.h" -#include "complaints.h" -#include "demangle.h" #include "elf-bfd.h" #include "elf/common.h" #include "elf/internal.h" #include "elf/mips.h" -#include "filenames.h" +#include "symtab.h" +#include "symfile.h" +#include "objfiles.h" +#include "stabsread.h" #include "gdb-stabs.h" -#include "gdb_bfd.h" -#include "gdbthread.h" +#include "complaints.h" +#include "demangle.h" +#include "psympriv.h" +#include "filenames.h" +#include "probe.h" +#include "arch-utils.h" #include "gdbtypes.h" +#include "value.h" #include "infcall.h" +#include "gdbthread.h" #include "inferior.h" +#include "regcache.h" +#include "bcache.h" +#include "gdb_bfd.h" +#include "build-id.h" #include "location.h" +#include "auxv.h" #include "mdebugread.h" -#include "objfiles.h" -#include "probe.h" -#include "psympriv.h" -#include "regcache.h" -#include "stabsread.h" -#include "symfile.h" -#include "symtab.h" -#include "value.h" /* Forward declarations. */ extern const struct sym_fns elf_sym_fns_gdb_index; diff --git a/gdb/eval.c b/gdb/eval.c index a67fd4f6716..3f768b45309 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -18,33 +18,29 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C includes. */ -#include <ctype.h> - -/* Local non-gdb includes. */ -#include "block.h" -#include "cp-abi.h" -#include "cp-support.h" +#include "symtab.h" +#include "gdbtypes.h" +#include "value.h" #include "expression.h" -#include "f-lang.h" +#include "target.h" #include "frame.h" -#include "gdb_obstack.h" #include "gdbthread.h" -#include "gdbtypes.h" +#include "language.h" /* For CAST_IS_CONVERSION. */ +#include "f-lang.h" /* For array bound stuff. */ +#include "cp-abi.h" #include "infcall.h" -#include "language.h" #include "objc-lang.h" -#include "objfiles.h" +#include "block.h" #include "parser-defs.h" -#include "regcache.h" -#include "symtab.h" -#include "target.h" -#include "typeprint.h" +#include "cp-support.h" #include "ui-out.h" +#include "regcache.h" #include "user-regs.h" #include "valprint.h" -#include "value.h" +#include "gdb_obstack.h" +#include "objfiles.h" +#include "typeprint.h" +#include <ctype.h> /* This is defined in valops.c */ extern int overload_resolution; diff --git a/gdb/event-loop.c b/gdb/event-loop.c index be09c2ceb3b..28e81646fbd 100644 --- a/gdb/event-loop.c +++ b/gdb/event-loop.c @@ -18,11 +18,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "common/queue.h" #include "event-loop.h" #include "event-top.h" +#include "common/queue.h" #include "ser-event.h" #ifdef HAVE_POLL diff --git a/gdb/event-top.c b/gdb/event-top.c index 78cbead9379..fb5d51c6e10 100644 --- a/gdb/event-top.c +++ b/gdb/event-top.c @@ -20,30 +20,26 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C includes. */ -#include <signal.h> - -/* Local non-gdb includes. */ -#include "annotate.h" -#include "cli/cli-script.h" -#include "common/buffer.h" -#include "continuations.h" -#include "event-loop.h" -#include "event-top.h" -#include "gdb_select.h" -#include "gdbcmd.h" -#include "gdbthread.h" +#include "top.h" #include "inferior.h" #include "infrun.h" +#include "target.h" +#include "terminal.h" /* for job_control */ +#include "event-loop.h" +#include "event-top.h" #include "interps.h" +#include <signal.h> +#include "cli/cli-script.h" /* for reset_command_nest_depth */ #include "main.h" -#include "maint.h" +#include "gdbthread.h" #include "observable.h" +#include "continuations.h" +#include "gdbcmd.h" /* for dont_repeat() */ +#include "annotate.h" +#include "maint.h" +#include "common/buffer.h" #include "ser-event.h" -#include "target.h" -#include "terminal.h" -#include "top.h" +#include "gdb_select.h" /* readline include files. */ #include "readline/readline.h" diff --git a/gdb/exceptions.c b/gdb/exceptions.c index c9a1fa7236c..a29ef0cde50 100644 --- a/gdb/exceptions.c +++ b/gdb/exceptions.c @@ -18,18 +18,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "annotate.h" -#include "breakpoint.h" -#include "common/gdb_optional.h" #include "exceptions.h" -#include "gdbthread.h" +#include "breakpoint.h" +#include "target.h" #include "inferior.h" +#include "annotate.h" +#include "ui-out.h" #include "serial.h" -#include "target.h" +#include "gdbthread.h" #include "top.h" -#include "ui-out.h" +#include "common/gdb_optional.h" static void print_flush (void) diff --git a/gdb/exec.c b/gdb/exec.c index 1c3c16c053e..77bd140a8e8 100644 --- a/gdb/exec.c +++ b/gdb/exec.c @@ -18,38 +18,34 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C includes. */ -#include <ctype.h> -#include <fcntl.h> -#include <sys/stat.h> - -/* Standard C++ includes. */ -#include <algorithm> - -/* Local non-gdb includes. */ -#include "arch-utils.h" -#include "common/pathstuff.h" -#include "completer.h" -#include "exec.h" -#include "filenames.h" #include "frame.h" -#include "gcore.h" -#include "gdb_bfd.h" -#include "gdbcmd.h" -#include "gdbcore.h" -#include "gdbthread.h" #include "inferior.h" +#include "target.h" +#include "gdbcmd.h" #include "language.h" +#include "filenames.h" +#include "symfile.h" #include "objfiles.h" +#include "completer.h" +#include "value.h" +#include "exec.h" #include "observable.h" +#include "arch-utils.h" +#include "gdbthread.h" #include "progspace.h" +#include "gdb_bfd.h" +#include "gcore.h" +#include "source.h" + +#include <fcntl.h> #include "readline/readline.h" +#include "gdbcore.h" + +#include <ctype.h> +#include <sys/stat.h> #include "solist.h" -#include "source.h" -#include "symfile.h" -#include "target.h" -#include "value.h" +#include <algorithm> +#include "common/pathstuff.h" void (*deprecated_file_changed_hook) (const char *); diff --git a/gdb/exec.h b/gdb/exec.h index 3778a7e32f1..e9af4802872 100644 --- a/gdb/exec.h +++ b/gdb/exec.h @@ -20,10 +20,10 @@ #ifndef EXEC_H #define EXEC_H -#include "memrange.h" +#include "target.h" #include "progspace.h" +#include "memrange.h" #include "symfile-add-flags.h" -#include "target.h" struct target_section; struct target_ops; diff --git a/gdb/expprint.c b/gdb/expprint.c index 2b136e26c62..a22499f4833 100644 --- a/gdb/expprint.c +++ b/gdb/expprint.c @@ -18,22 +18,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C includes. */ -#include <ctype.h> - -/* Local non-gdb includes. */ -#include "block.h" -#include "expression.h" +#include "symtab.h" #include "gdbtypes.h" +#include "expression.h" +#include "value.h" #include "language.h" -#include "objfiles.h" #include "parser-defs.h" -#include "symtab.h" +#include "user-regs.h" /* For user_reg_map_regnum_to_name. */ #include "target.h" -#include "user-regs.h" +#include "block.h" +#include "objfiles.h" #include "valprint.h" -#include "value.h" + +#include <ctype.h> void print_expression (struct expression *exp, struct ui_file *stream) diff --git a/gdb/extension-priv.h b/gdb/extension-priv.h index 5b99c0fb8db..97594f853a2 100644 --- a/gdb/extension-priv.h +++ b/gdb/extension-priv.h @@ -21,11 +21,9 @@ #ifndef EXTENSION_PRIV_H #define EXTENSION_PRIV_H +#include "extension.h" #include <signal.h> - -/* Local non-gdb includes. */ #include "cli/cli-script.h" -#include "extension.h" /* High level description of an extension/scripting language. An entry for each is compiled into GDB regardless of whether the support diff --git a/gdb/extension.c b/gdb/extension.c index 0e44140786e..8637bc53f2e 100644 --- a/gdb/extension.c +++ b/gdb/extension.c @@ -21,21 +21,17 @@ have "ext_lang" in the name, and no other symbol in gdb does. */ #include "defs.h" - -/* Standard C includes. */ #include <signal.h> - -/* Local non-gdb includes. */ +#include "target.h" #include "auto-load.h" #include "breakpoint.h" -#include "cli/cli-script.h" #include "event-top.h" -#include "extension-priv.h" #include "extension.h" -#include "guile/guile.h" +#include "extension-priv.h" #include "observable.h" +#include "cli/cli-script.h" #include "python/python.h" -#include "target.h" +#include "guile/guile.h" /* Iterate over all external extension languages, regardless of whether the support has been compiled in or not. diff --git a/gdb/extension.h b/gdb/extension.h index a77f1575ede..2f1b71851c6 100644 --- a/gdb/extension.h +++ b/gdb/extension.h @@ -20,9 +20,9 @@ #ifndef EXTENSION_H #define EXTENSION_H -#include "common/array-view.h" +#include "mi/mi-cmds.h" /* For PRINT_NO_VALUES, etc. */ #include "common/vec.h" -#include "mi/mi-cmds.h" +#include "common/array-view.h" struct breakpoint; struct command_line; diff --git a/gdb/f-lang.c b/gdb/f-lang.c index 5128caea815..7bd119690b4 100644 --- a/gdb/f-lang.c +++ b/gdb/f-lang.c @@ -21,25 +21,22 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C includes. */ -#include <math.h> - -/* Local non-gdb includes. */ -#include "c-lang.h" -#include "charset.h" -#include "cp-support.h" -#include "expression.h" -#include "f-lang.h" -#include "gdbcore.h" +#include "symtab.h" #include "gdbtypes.h" -#include "language.h" +#include "expression.h" #include "parser-defs.h" -#include "symtab.h" -#include "target-float.h" +#include "language.h" +#include "varobj.h" +#include "gdbcore.h" +#include "f-lang.h" #include "valprint.h" #include "value.h" -#include "varobj.h" +#include "cp-support.h" +#include "charset.h" +#include "c-lang.h" +#include "target-float.h" + +#include <math.h> /* Local functions */ diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c index d3c83b0720f..a0e34b3058d 100644 --- a/gdb/f-typeprint.c +++ b/gdb/f-typeprint.c @@ -21,18 +21,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ +#include "gdb_obstack.h" #include "bfd.h" +#include "symtab.h" +#include "gdbtypes.h" #include "expression.h" -#include "f-lang.h" -#include "gdb_obstack.h" +#include "value.h" #include "gdbcore.h" -#include "gdbtypes.h" -#include "symtab.h" #include "target.h" +#include "f-lang.h" #include "typeprint.h" -#include "value.h" #if 0 /* Currently unused. */ static void f_type_print_args (struct type *, struct ui_file *); diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c index 0dea6ba407e..5f9dd4dedb8 100644 --- a/gdb/f-valprint.c +++ b/gdb/f-valprint.c @@ -21,20 +21,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "block.h" -#include "command.h" -#include "dictionary.h" +#include "symtab.h" +#include "gdbtypes.h" #include "expression.h" +#include "value.h" +#include "valprint.h" +#include "language.h" #include "f-lang.h" #include "frame.h" #include "gdbcore.h" -#include "gdbtypes.h" -#include "language.h" -#include "symtab.h" -#include "valprint.h" -#include "value.h" +#include "command.h" +#include "block.h" +#include "dictionary.h" static void f77_get_dynamic_length_of_aggregate (struct type *); diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c index fe85847edce..d4f4c8cf359 100644 --- a/gdb/fbsd-nat.c +++ b/gdb/fbsd-nat.c @@ -18,37 +18,33 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C includes. */ -#if defined(HAVE_KINFO_GETFILE) || defined(HAVE_KINFO_GETVMMAP) -#include <libutil.h> -#endif +#include "common/byte-vector.h" +#include "gdbcore.h" +#include "inferior.h" +#include "regcache.h" +#include "regset.h" +#include "gdbcmd.h" +#include "gdbthread.h" +#include "common/gdb_wait.h" +#include "inf-ptrace.h" +#include <sys/types.h> #include <sys/procfs.h> #include <sys/ptrace.h> #include <sys/signal.h> #include <sys/sysctl.h> -#include <sys/types.h> #include <sys/user.h> - -/* Standard C++ includes. */ -#include <list> - -/* Local non-gdb includes. */ -#include "common/byte-vector.h" +#if defined(HAVE_KINFO_GETFILE) || defined(HAVE_KINFO_GETVMMAP) +#include <libutil.h> +#endif #if !defined(HAVE_KINFO_GETVMMAP) #include "common/filestuff.h" #endif -#include "common/gdb_wait.h" + #include "elf-bfd.h" #include "fbsd-nat.h" #include "fbsd-tdep.h" -#include "gdbcmd.h" -#include "gdbcore.h" -#include "gdbthread.h" -#include "inf-ptrace.h" -#include "inferior.h" -#include "regcache.h" -#include "regset.h" + +#include <list> /* Return the name of a file that can be opened to get the symbols for the child process identified by PID. */ diff --git a/gdb/fbsd-nat.h b/gdb/fbsd-nat.h index 5dec9825393..b0c9eb16c77 100644 --- a/gdb/fbsd-nat.h +++ b/gdb/fbsd-nat.h @@ -20,10 +20,8 @@ #ifndef FBSD_NAT_H #define FBSD_NAT_H -#include <sys/proc.h> - -/* Local non-gdb includes. */ #include "inf-ptrace.h" +#include <sys/proc.h> #ifdef TRAP_BRKPT /* MIPS does not set si_code for SIGTRAP. sparc64 reports diff --git a/gdb/fbsd-tdep.c b/gdb/fbsd-tdep.c index 73d62cffe01..cd207d88bc3 100644 --- a/gdb/fbsd-tdep.c +++ b/gdb/fbsd-tdep.c @@ -18,22 +18,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C includes. */ -#include <arpa/inet.h> -#include <sys/socket.h> - -/* Local non-gdb includes. */ #include "auxv.h" -#include "elf-bfd.h" -#include "fbsd-tdep.h" #include "gdbcore.h" -#include "gdbthread.h" #include "inferior.h" -#include "objfiles.h" #include "regcache.h" #include "regset.h" +#include "gdbthread.h" +#include "objfiles.h" #include "xml-syscall.h" +#include <sys/socket.h> +#include <arpa/inet.h> + +#include "elf-bfd.h" +#include "fbsd-tdep.h" /* This enum is derived from FreeBSD's <sys/signal.h>. */ diff --git a/gdb/filename-seen-cache.c b/gdb/filename-seen-cache.c index 65ac33c9fa6..a8ea0858ac8 100644 --- a/gdb/filename-seen-cache.c +++ b/gdb/filename-seen-cache.c @@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ #include "filename-seen-cache.h" #include "filenames.h" diff --git a/gdb/filename-seen-cache.h b/gdb/filename-seen-cache.h index 5ed63047589..824245e77e6 100644 --- a/gdb/filename-seen-cache.h +++ b/gdb/filename-seen-cache.h @@ -20,8 +20,8 @@ #ifndef FILENAME_SEEN_CACHE_H #define FILENAME_SEEN_CACHE_H -#include "common/function-view.h" #include "defs.h" +#include "common/function-view.h" /* Cache to watch for file names already seen. */ diff --git a/gdb/filesystem.c b/gdb/filesystem.c index e5eab1c1079..fdc4713007a 100644 --- a/gdb/filesystem.c +++ b/gdb/filesystem.c @@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ #include "filesystem.h" #include "gdbarch.h" #include "gdbcmd.h" diff --git a/gdb/findcmd.c b/gdb/findcmd.c index 6d66730edee..52f8f80aaae 100644 --- a/gdb/findcmd.c +++ b/gdb/findcmd.c @@ -18,20 +18,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C includes. */ -#include <ctype.h> - -/* Standard C++ includes. */ -#include <algorithm> - -/* Local non-gdb includes. */ #include "arch-utils.h" -#include "cli/cli-utils.h" -#include "common/byte-vector.h" +#include <ctype.h> #include "gdbcmd.h" -#include "target.h" #include "value.h" +#include "target.h" +#include "cli/cli-utils.h" +#include <algorithm> +#include "common/byte-vector.h" /* Copied from bfd_put_bits. */ diff --git a/gdb/findvar.c b/gdb/findvar.c index 0b97db57199..e89ee37ffc7 100644 --- a/gdb/findvar.c +++ b/gdb/findvar.c @@ -18,23 +18,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "block.h" -#include "common/selftest.h" -#include "dwarf2loc.h" +#include "symtab.h" +#include "gdbtypes.h" #include "frame.h" +#include "value.h" #include "gdbcore.h" -#include "gdbtypes.h" #include "inferior.h" -#include "language.h" -#include "objfiles.h" -#include "regcache.h" -#include "symfile.h" -#include "symtab.h" #include "target.h" +#include "symfile.h" /* for overlay functions */ +#include "regcache.h" #include "user-regs.h" -#include "value.h" +#include "block.h" +#include "objfiles.h" +#include "language.h" +#include "dwarf2loc.h" +#include "common/selftest.h" /* Basic byte-swapping routines. All 'extract' functions return a host-format integer from a target-format integer at ADDR which is diff --git a/gdb/fork-child.c b/gdb/fork-child.c index a4108231fc5..4c49848830a 100644 --- a/gdb/fork-child.c +++ b/gdb/fork-child.c @@ -20,17 +20,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "common/common-inferior.h" -#include "common/filestuff.h" -#include "common/job-control.h" -#include "gdbcmd.h" -#include "gdbthread.h" #include "inferior.h" -#include "nat/fork-inferior.h" +#include "gdbcmd.h" #include "terminal.h" +#include "gdbthread.h" #include "top.h" +#include "common/job-control.h" +#include "common/filestuff.h" +#include "nat/fork-inferior.h" +#include "common/common-inferior.h" /* The exec-wrapper, if any, that will be used when starting the inferior. */ diff --git a/gdb/frame-base.c b/gdb/frame-base.c index 8a580cd2084..47897fc653d 100644 --- a/gdb/frame-base.c +++ b/gdb/frame-base.c @@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ #include "frame-base.h" #include "frame.h" #include "gdb_obstack.h" diff --git a/gdb/frame-unwind.c b/gdb/frame-unwind.c index 46096c212b4..e5ddeba9077 100644 --- a/gdb/frame-unwind.c +++ b/gdb/frame-unwind.c @@ -18,16 +18,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "dummy-frame.h" -#include "frame-unwind.h" #include "frame.h" -#include "gdb_obstack.h" +#include "frame-unwind.h" +#include "dummy-frame.h" #include "inline-frame.h" +#include "value.h" #include "regcache.h" +#include "gdb_obstack.h" #include "target.h" -#include "value.h" static struct gdbarch_data *frame_unwind_data; diff --git a/gdb/frame.c b/gdb/frame.c index 9b8f0bcc400..d8b5f819f1d 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -18,32 +18,30 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "annotate.h" -#include "block.h" -#include "command.h" -#include "dummy-frame.h" -#include "frame-base.h" -#include "frame-unwind.h" #include "frame.h" +#include "target.h" +#include "value.h" +#include "inferior.h" /* for inferior_ptid */ +#include "regcache.h" +#include "user-regs.h" #include "gdb_obstack.h" -#include "gdbcmd.h" +#include "dummy-frame.h" +#include "sentinel-frame.h" #include "gdbcore.h" -#include "gdbthread.h" -#include "hashtab.h" -#include "inferior.h" -#include "inline-frame.h" +#include "annotate.h" #include "language.h" -#include "objfiles.h" +#include "frame-unwind.h" +#include "frame-base.h" +#include "command.h" +#include "gdbcmd.h" #include "observable.h" -#include "regcache.h" -#include "sentinel-frame.h" -#include "target.h" +#include "objfiles.h" +#include "gdbthread.h" +#include "block.h" +#include "inline-frame.h" #include "tracepoint.h" -#include "user-regs.h" +#include "hashtab.h" #include "valprint.h" -#include "value.h" /* The sentinel frame terminates the innermost end of the frame chain. If unwound, it returns the information needed to construct an diff --git a/gdb/frv-linux-tdep.c b/gdb/frv-linux-tdep.c index b47d373421e..e5261455fd9 100644 --- a/gdb/frv-linux-tdep.c +++ b/gdb/frv-linux-tdep.c @@ -19,20 +19,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "elf-bfd.h" -#include "elf/frv.h" -#include "frame-unwind.h" -#include "frame.h" -#include "frv-tdep.h" #include "gdbcore.h" -#include "linux-tdep.h" +#include "target.h" +#include "frame.h" #include "osabi.h" #include "regcache.h" -#include "regset.h" -#include "target.h" +#include "elf-bfd.h" +#include "elf/frv.h" +#include "frv-tdep.h" #include "trad-frame.h" +#include "frame-unwind.h" +#include "regset.h" +#include "linux-tdep.h" /* Define the size (in bytes) of an FR-V instruction. */ static const int frv_instr_size = 4; diff --git a/gdb/frv-tdep.c b/gdb/frv-tdep.c index 9c00f96c190..804206bcb37 100644 --- a/gdb/frv-tdep.c +++ b/gdb/frv-tdep.c @@ -18,28 +18,26 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Local non-gdb includes. */ -#include "../opcodes/frv-desc.h" +#include "inferior.h" +#include "gdbcore.h" #include "arch-utils.h" +#include "regcache.h" +#include "frame.h" +#include "frame-unwind.h" +#include "frame-base.h" +#include "trad-frame.h" #include "dis-asm.h" +#include "sim-regno.h" +#include "gdb/sim-frv.h" +#include "../opcodes/frv-desc.h" /* for the H_SPR_... enums */ +#include "symtab.h" #include "elf-bfd.h" #include "elf/frv.h" -#include "frame-base.h" -#include "frame-unwind.h" -#include "frame.h" -#include "frv-tdep.h" -#include "gdb/sim-frv.h" -#include "gdbcore.h" -#include "infcall.h" -#include "inferior.h" -#include "objfiles.h" #include "osabi.h" -#include "regcache.h" -#include "sim-regno.h" +#include "infcall.h" #include "solib.h" -#include "symtab.h" -#include "trad-frame.h" +#include "frv-tdep.h" +#include "objfiles.h" struct frv_unwind_cache /* was struct frame_extra_info */ { diff --git a/gdb/ft32-tdep.c b/gdb/ft32-tdep.c index 404ec98484f..bded02fae4b 100644 --- a/gdb/ft32-tdep.c +++ b/gdb/ft32-tdep.c @@ -18,32 +18,30 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" - -/* Standard C++ includes. */ -#include <algorithm> - -/* Local non-gdb includes. */ -#include "arch-utils.h" -#include "dis-asm.h" -#include "frame-base.h" -#include "frame-unwind.h" #include "frame.h" -#include "ft32-tdep.h" -#include "gdb/sim-ft32.h" +#include "frame-unwind.h" +#include "frame-base.h" +#include "symtab.h" +#include "gdbtypes.h" #include "gdbcmd.h" #include "gdbcore.h" -#include "gdbtypes.h" +#include "value.h" #include "inferior.h" -#include "language.h" +#include "symfile.h" #include "objfiles.h" -#include "opcode/ft32.h" #include "osabi.h" -#include "record.h" +#include "language.h" +#include "arch-utils.h" #include "regcache.h" -#include "symfile.h" -#include "symtab.h" #include "trad-frame.h" -#include "value.h" +#include "dis-asm.h" +#include "record.h" + +#include "opcode/ft32.h" + +#include "ft32-tdep.h" +#include "gdb/sim-ft32.h" +#include <algorithm> #define RAM_BIAS 0x800000 /* Bias added to RAM addresses. */ |