diff mbox series

[6/7] gdb: don't include hashtab.h in defs.h

Message ID 20240422201157.46375-7-simon.marchi@efficios.com
State New
Headers
Series First cleanup of defs.h |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 fail Patch failed to apply
linaro-tcwg-bot/tcwg_gdb_build--master-arm fail Patch failed to apply

Commit Message

Simon Marchi April 22, 2024, 8:10 p.m. UTC 
  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
---
 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 mbox series

Patch

diff --git a/gdb/defs.h b/gdb/defs.h
index 535ca6716732..8ef36c16df97 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 a749b95ee28d..d4eab0838bfe 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 0a871a7e364a..339012949cd7 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 5260bcbde003..9ba1299f95e1 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 <optional>
 
 struct breakpoint;