Don't include cooked-index.h from dwarf2/read.h

dwarf2/read.h includes cooked-index.h, but it doesn't need to.  This
patch removes the inclusion from this header, and adds one to
index-write.c to make up for the absence.

diff --git a/gdb/dwarf2/index-write.c b/gdb/dwarf2/index-write.c
index 9c1f4013760a0007884b499af64d0767bbbe0d74..c9d6e633bf37ae2217ab31ae2b9ff26247aab9bc 100644 (file)
--- a/gdb/dwarf2/index-write.c
+++ b/gdb/dwarf2/index-write.c
@@ -30,6 +30,7 @@
 #include "gdbsupport/scoped_fd.h"
 #include "complaints.h"
 #include "dwarf2/index-common.h"
+#include "dwarf2/cooked-index.h"
 #include "dwarf2.h"
 #include "dwarf2/read.h"
 #include "dwarf2/dwz.h"

diff --git a/gdb/dwarf2/read.h b/gdb/dwarf2/read.h
index 96f38a9bbcb0956a6e3829b169c181e70d7bac65..dc7abf23ba46f9feaa0eb7063892bf1c8dc5cb16 100644 (file)
--- a/gdb/dwarf2/read.h
+++ b/gdb/dwarf2/read.h
@@ -23,7 +23,6 @@
 #include <queue>
 #include <unordered_map>
 #include "dwarf2/comp-unit-head.h"
-#include "dwarf2/cooked-index.h"
 #include "dwarf2/file-and-dir.h"
 #include "dwarf2/index-cache.h"
 #include "dwarf2/mapped-index.h"