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 <jhb@FreeBSD.org>

diff --git a/gdb/defs.h b/gdb/defs.h
index 535ca671673248751595fd3ca9d71d6b604c87cf..8ef36c16df97c2185fd5101da791a2a133ae77d8 100644 (file)
--- 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 a749b95ee28d5e57c469991efec1dd5558076415..d4eab0838bfe6aaf398f0157789c0e6604570041 100644 (file)
--- 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 0a871a7e364a289f1f10b37d333593c5ca5eb245..339012949cd7a91af995bf9c5e7553996fc4c0f9 100644 (file)
--- 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 5260bcbde0031956cd19f059942995d652884f5c..9ba1299f95e109f5eb5f33449bc0252e001d8cbd 100644 (file)
--- 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 <optional>
 
 struct breakpoint;