From 740ccea39ecf04c96025a04c5f97de28c71ff8b5 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 22 Apr 2024 16:10:16 -0400 Subject: gdb: don't include hashtab.h in defs.h Nothing in defs.h actually uses this. Add some includes for some spots using things from hashtab.h. Note that if the GDB build doesn't use libxxhash, hashtab.h is included by gdbsupport/common-utils.h, so all files still see hashtab.h. It puzzled me for some time why I didn't see build failures in my build (which didn't use libxxhash) but the buildbot gave build failures (it uses libxxhash). Change-Id: I8efd68decdaf579f048941c7537cd689885caa2a Approved-By: John Baldwin --- gdb/defs.h | 2 -- gdb/dwarf2/die.h | 1 + gdb/dwarf2/index-common.h | 1 + gdb/extension.h | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gdb/defs.h b/gdb/defs.h index 535ca67..8ef36c1 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -82,8 +82,6 @@ #define O_BINARY 0 #endif -#include "hashtab.h" - /* * System root path, used to find libraries etc. */ extern std::string gdb_sysroot; diff --git a/gdb/dwarf2/die.h b/gdb/dwarf2/die.h index a749b95..d4eab08 100644 --- a/gdb/dwarf2/die.h +++ b/gdb/dwarf2/die.h @@ -22,6 +22,7 @@ #include "complaints.h" #include "dwarf2/attribute.h" +#include "hashtab.h" /* This data structure holds a complete die structure. */ struct die_info diff --git a/gdb/dwarf2/index-common.h b/gdb/dwarf2/index-common.h index 0a871a7..3390129 100644 --- a/gdb/dwarf2/index-common.h +++ b/gdb/dwarf2/index-common.h @@ -21,6 +21,7 @@ #define DWARF_INDEX_COMMON_H #include "extract-store-integer.h" +#include "hashtab.h" /* The suffix for an index file. */ #define INDEX4_SUFFIX ".gdb-index" diff --git a/gdb/extension.h b/gdb/extension.h index 5260bcb..9ba1299 100644 --- a/gdb/extension.h +++ b/gdb/extension.h @@ -22,6 +22,7 @@ #include "mi/mi-cmds.h" #include "gdbsupport/array-view.h" +#include "hashtab.h" #include struct breakpoint; -- cgit v1.1