From: Simon Marchi Date: Wed, 14 Dec 2022 03:34:31 +0000 (-0500) Subject: gdb: remove language.h include from frame.h X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=83b6e1f1c52c632a7b554674306cc586e03f7855;p=binutils-gdb.git gdb: remove language.h include from frame.h This helps resolve some cyclic include problem later in the series. The only language-related thing frame.h needs is enum language, and that is in defs.h. Doing so reveals that a bunch of files were relying on frame.h to include language.h, so fix the fallouts here and there. Change-Id: I178a7efec1953c2d088adb58483bade1f349b705 Reviewed-By: Bruno Larsen --- diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c index 7bf36d825c8..aeca30587a5 100644 --- a/gdb/aarch64-tdep.c +++ b/gdb/aarch64-tdep.c @@ -21,6 +21,7 @@ #include "defs.h" #include "frame.h" +#include "language.h" #include "gdbcmd.h" #include "gdbcore.h" #include "dis-asm.h" diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c index 76e843ecc35..70d0d0f3318 100644 --- a/gdb/amd64-tdep.c +++ b/gdb/amd64-tdep.c @@ -20,6 +20,7 @@ along with this program. If not, see . */ #include "defs.h" +#include "language.h" #include "opcode/i386.h" #include "dis-asm.h" #include "arch-utils.h" diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 51ec5236af1..56936bd7b55 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -22,6 +22,7 @@ #include /* XXX for isupper (). */ #include "frame.h" +#include "language.h" #include "inferior.h" #include "infrun.h" #include "gdbcmd.h" diff --git a/gdb/cp-abi.c b/gdb/cp-abi.c index e9e4224c99d..87a3b5c0a96 100644 --- a/gdb/cp-abi.c +++ b/gdb/cp-abi.c @@ -18,6 +18,7 @@ along with this program. If not, see . */ #include "defs.h" +#include "language.h" #include "value.h" #include "cp-abi.h" #include "command.h" diff --git a/gdb/cp-support.c b/gdb/cp-support.c index b7ed2101b78..6a96f9f213e 100644 --- a/gdb/cp-support.c +++ b/gdb/cp-support.c @@ -20,6 +20,7 @@ #include "defs.h" #include "cp-support.h" +#include "language.h" #include "demangle.h" #include "gdbcmd.h" #include "dictionary.h" diff --git a/gdb/expop.h b/gdb/expop.h index de74e88998f..9e6ab0dd244 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -24,6 +24,7 @@ #include "c-lang.h" #include "cp-abi.h" #include "expression.h" +#include "language.h" #include "objfiles.h" #include "gdbsupport/traits.h" #include "gdbsupport/enum-flags.h" diff --git a/gdb/f-lang.h b/gdb/f-lang.h index b3c13927f26..673e273d31a 100644 --- a/gdb/f-lang.h +++ b/gdb/f-lang.h @@ -23,6 +23,7 @@ #ifndef F_LANG_H #define F_LANG_H +#include "language.h" #include "valprint.h" struct type_print_options; diff --git a/gdb/frame.h b/gdb/frame.h index 5935465262d..2c2e320bf7d 100644 --- a/gdb/frame.h +++ b/gdb/frame.h @@ -71,7 +71,6 @@ */ -#include "language.h" #include "cli/cli-option.h" #include "gdbsupport/common-debug.h" diff --git a/gdb/gnu-v3-abi.c b/gdb/gnu-v3-abi.c index 7a0a70f1e11..6f5b87f1308 100644 --- a/gdb/gnu-v3-abi.c +++ b/gdb/gnu-v3-abi.c @@ -19,6 +19,7 @@ along with this program. If not, see . */ #include "defs.h" +#include "language.h" #include "value.h" #include "cp-abi.h" #include "cp-support.h" diff --git a/gdb/go-lang.h b/gdb/go-lang.h index f0929cc3ac5..1820b4c9658 100644 --- a/gdb/go-lang.h +++ b/gdb/go-lang.h @@ -22,6 +22,7 @@ struct type_print_options; +#include "language.h" #include "gdbtypes.h" #include "symtab.h" #include "value.h" diff --git a/gdb/m2-typeprint.c b/gdb/m2-typeprint.c index 62917e8a345..00a328852e9 100644 --- a/gdb/m2-typeprint.c +++ b/gdb/m2-typeprint.c @@ -17,6 +17,7 @@ along with this program. If not, see . */ #include "defs.h" +#include "language.h" #include "gdbsupport/gdb_obstack.h" #include "bfd.h" /* Binary File Description */ #include "symtab.h" diff --git a/gdb/namespace.c b/gdb/namespace.c index 735b102e8b5..bdf5e8ffab4 100644 --- a/gdb/namespace.c +++ b/gdb/namespace.c @@ -19,6 +19,7 @@ #include "defs.h" #include "namespace.h" #include "frame.h" +#include "symtab.h" /* Add a using directive to USING_DIRECTIVES. If the using directive in question has already been added, don't add it twice. diff --git a/gdb/ppc-sysv-tdep.c b/gdb/ppc-sysv-tdep.c index 9cea63307e6..3df56c8b75c 100644 --- a/gdb/ppc-sysv-tdep.c +++ b/gdb/ppc-sysv-tdep.c @@ -19,6 +19,7 @@ along with this program. If not, see . */ #include "defs.h" +#include "language.h" #include "gdbcore.h" #include "inferior.h" #include "regcache.h" diff --git a/gdb/python/py-disasm.c b/gdb/python/py-disasm.c index 13ac85c097d..c3d8d8a7994 100644 --- a/gdb/python/py-disasm.c +++ b/gdb/python/py-disasm.c @@ -19,6 +19,7 @@ #include "defs.h" #include "python-internal.h" +#include "language.h" #include "dis-asm.h" #include "arch-utils.h" #include "charset.h" diff --git a/gdb/python/py-frame.c b/gdb/python/py-frame.c index 6d4e8c20dc1..f66d22bfa3d 100644 --- a/gdb/python/py-frame.c +++ b/gdb/python/py-frame.c @@ -18,6 +18,7 @@ along with this program. If not, see . */ #include "defs.h" +#include "language.h" #include "charset.h" #include "block.h" #include "frame.h" diff --git a/gdb/thread.c b/gdb/thread.c index efcbe649643..1a852f70206 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -20,6 +20,7 @@ along with this program. If not, see . */ #include "defs.h" +#include "language.h" #include "symtab.h" #include "frame.h" #include "inferior.h"