Move DWARF code to dwarf2/ subdirectory

This moves all the remaining DWARF code to the new dwarf2
subdirectory.  This is just a simple renaming, with updates to
includes as needed.

gdb/ChangeLog
2020-02-08  Tom Tromey  <tom@tromey.com>

	* dwarf2/expr.c: Rename from dwarf2expr.c.
	* dwarf2/expr.h: Rename from dwarf2expr.h.
	* dwarf2/frame-tailcall.c: Rename from dwarf2-frame-tailcall.c.
	* dwarf2/frame-tailcall.h: Rename from dwarf2-frame-tailcall.h.
	* dwarf2/frame.c: Rename from dwarf2-frame.c.
	* dwarf2/frame.h: Rename from dwarf2-frame.h.
	* dwarf2/index-cache.c: Rename from dwarf-index-cache.c.
	* dwarf2/index-cache.h: Rename from dwarf-index-cache.h.
	* dwarf2/index-common.c: Rename from dwarf-index-common.c.
	* dwarf2/index-common.h: Rename from dwarf-index-common.h.
	* dwarf2/index-write.c: Rename from dwarf-index-write.c.
	* dwarf2/index-write.h: Rename from dwarf-index-write.h.
	* dwarf2/loc.c: Rename from dwarf2loc.c.
	* dwarf2/loc.h: Rename from dwarf2loc.h.
	* dwarf2/read.c: Rename from dwarf2read.c.
	* dwarf2/read.h: Rename from dwarf2read.h.
	* dwarf2/abbrev.c, aarch64-tdep.c, alpha-tdep.c,
	amd64-darwin-tdep.c, arc-tdep.c, arm-tdep.c, bfin-tdep.c,
	compile/compile-c-symbols.c, compile/compile-cplus-symbols.c,
	compile/compile-loc2c.c, cris-tdep.c, csky-tdep.c, findvar.c,
	gdbtypes.c, guile/scm-type.c, h8300-tdep.c, hppa-bsd-tdep.c,
	hppa-linux-tdep.c, i386-darwin-tdep.c, i386-linux-tdep.c,
	i386-tdep.c, iq2000-tdep.c, m32c-tdep.c, m68hc11-tdep.c,
	m68k-tdep.c, microblaze-tdep.c, mips-tdep.c, mn10300-tdep.c,
	msp430-tdep.c, nds32-tdep.c, nios2-tdep.c, or1k-tdep.c,
	riscv-tdep.c, rl78-tdep.c, rs6000-tdep.c, rx-tdep.c, s12z-tdep.c,
	s390-tdep.c, score-tdep.c, sh-tdep.c, sparc-linux-tdep.c,
	sparc-tdep.c, sparc64-linux-tdep.c, sparc64-tdep.c, tic6x-tdep.c,
	tilegx-tdep.c, v850-tdep.c, xstormy16-tdep.c, xtensa-tdep.c:
	Update.
	* Makefile.in (COMMON_SFILES): Update.
	(HFILES_NO_SRCDIR): Update.

Change-Id: Ied9ce1436cd27ac4a4cffef10ec92e396f181928

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 15a85a6e35dc55b228533f80e3f727116e85e9b6..50fe34b858400598606044bdd6e1cfbe67680b26 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,38 @@
+2020-02-08  Tom Tromey  <tom@tromey.com>
+
+       * dwarf2/expr.c: Rename from dwarf2expr.c.
+       * dwarf2/expr.h: Rename from dwarf2expr.h.
+       * dwarf2/frame-tailcall.c: Rename from dwarf2-frame-tailcall.c.
+       * dwarf2/frame-tailcall.h: Rename from dwarf2-frame-tailcall.h.
+       * dwarf2/frame.c: Rename from dwarf2-frame.c.
+       * dwarf2/frame.h: Rename from dwarf2-frame.h.
+       * dwarf2/index-cache.c: Rename from dwarf-index-cache.c.
+       * dwarf2/index-cache.h: Rename from dwarf-index-cache.h.
+       * dwarf2/index-common.c: Rename from dwarf-index-common.c.
+       * dwarf2/index-common.h: Rename from dwarf-index-common.h.
+       * dwarf2/index-write.c: Rename from dwarf-index-write.c.
+       * dwarf2/index-write.h: Rename from dwarf-index-write.h.
+       * dwarf2/loc.c: Rename from dwarf2loc.c.
+       * dwarf2/loc.h: Rename from dwarf2loc.h.
+       * dwarf2/read.c: Rename from dwarf2read.c.
+       * dwarf2/read.h: Rename from dwarf2read.h.
+       * dwarf2/abbrev.c, aarch64-tdep.c, alpha-tdep.c,
+       amd64-darwin-tdep.c, arc-tdep.c, arm-tdep.c, bfin-tdep.c,
+       compile/compile-c-symbols.c, compile/compile-cplus-symbols.c,
+       compile/compile-loc2c.c, cris-tdep.c, csky-tdep.c, findvar.c,
+       gdbtypes.c, guile/scm-type.c, h8300-tdep.c, hppa-bsd-tdep.c,
+       hppa-linux-tdep.c, i386-darwin-tdep.c, i386-linux-tdep.c,
+       i386-tdep.c, iq2000-tdep.c, m32c-tdep.c, m68hc11-tdep.c,
+       m68k-tdep.c, microblaze-tdep.c, mips-tdep.c, mn10300-tdep.c,
+       msp430-tdep.c, nds32-tdep.c, nios2-tdep.c, or1k-tdep.c,
+       riscv-tdep.c, rl78-tdep.c, rs6000-tdep.c, rx-tdep.c, s12z-tdep.c,
+       s390-tdep.c, score-tdep.c, sh-tdep.c, sparc-linux-tdep.c,
+       sparc-tdep.c, sparc64-linux-tdep.c, sparc64-tdep.c, tic6x-tdep.c,
+       tilegx-tdep.c, v850-tdep.c, xstormy16-tdep.c, xtensa-tdep.c:
+       Update.
+       * Makefile.in (COMMON_SFILES): Update.
+       (HFILES_NO_SRCDIR): Update.
+
 2020-02-08  Tom Tromey  <tom@tromey.com>
 
        * dwarf2read.c (struct die_reader_specs) <comp_dir>: Remove.

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index b726ae8cb266fcf347435ca2ee2b92bd73493688..7d44a6b6fd56f31c80c1825bbfe9a13bfa557fd0 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -994,17 +994,17 @@ COMMON_SFILES = \
        disasm.c \
        disasm-selftests.c \
        dummy-frame.c \
-       dwarf-index-cache.c \
-       dwarf-index-common.c \
-       dwarf-index-write.c \
-       dwarf2-frame.c \
-       dwarf2-frame-tailcall.c \
-       dwarf2expr.c \
-       dwarf2loc.c \
-       dwarf2read.c \
        dwarf2/abbrev.c \
        dwarf2/attribute.c \
+       dwarf2/expr.c \
+       dwarf2/frame-tailcall.c \
+       dwarf2/frame.c \
+       dwarf2/index-cache.c \
+       dwarf2/index-common.c \
+       dwarf2/index-write.c \
        dwarf2/leb.c \
+       dwarf2/loc.c \
+       dwarf2/read.c \
        dwarf2/section.c \
        eval.c \
        event-loop.c \
@@ -1234,13 +1234,13 @@ HFILES_NO_SRCDIR = \
        dictionary.h \
        disasm.h \
        dummy-frame.h \
-       dwarf-index-cache.h \
-       dwarf-index-common.h \
-       dwarf2-frame.h \
-       dwarf2-frame-tailcall.h \
-       dwarf2expr.h \
-       dwarf2loc.h \
-       dwarf2read.h \
+       dwarf2/frame-tailcall.h \
+       dwarf2/frame.h \
+       dwarf2/expr.h \
+       dwarf2/index-cache.h \
+       dwarf2/index-common.h \
+       dwarf2/loc.h \
+       dwarf2/read.h \
        event-loop.h \
        event-top.h \
        exceptions.h \

diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
index 120c5db627083cdf1dcc05d6b5e0291587118b3e..1c44345e573132f7bb921b9eb0b488684c9c3bc3 100644 (file)
--- a/gdb/aarch64-tdep.c
+++ b/gdb/aarch64-tdep.c
@@ -34,7 +34,7 @@
 #include "trad-frame.h"
 #include "objfiles.h"
 #include "dwarf2.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "gdbtypes.h"
 #include "prologue-value.h"
 #include "target-descriptions.h"

diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
index 390f865edad20db45b02e916cf24f4ca59b6b32c..aabd202b1ccd02df6a2daf836d092ff71f1403e4 100644 (file)
--- a/gdb/alpha-tdep.c
+++ b/gdb/alpha-tdep.c
@@ -21,7 +21,7 @@
 #include "frame.h"
 #include "frame-unwind.h"
 #include "frame-base.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "inferior.h"
 #include "symtab.h"
 #include "value.h"

diff --git a/gdb/amd64-darwin-tdep.c b/gdb/amd64-darwin-tdep.c
index 5e8f352ffc9c929d4f6893fcb84b2b287bc77eb2..447e272f4ea159c9c07a035057ed8ecdfbc2c682 100644 (file)
--- a/gdb/amd64-darwin-tdep.c
+++ b/gdb/amd64-darwin-tdep.c
@@ -36,7 +36,7 @@
 #include "i386-darwin-tdep.h"
 #include "solib.h"
 #include "solib-darwin.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 
 /* Offsets into the struct x86_thread_state64 where we'll find the saved regs.
    From <mach/i386/thread_status.h> and amd64-tdep.h.  */

diff --git a/gdb/arc-tdep.c b/gdb/arc-tdep.c
index 13da0226f786b72e149d5054c0cfbacdcc9d7af3..ac98f03efc1151fc25aec73803d542a479faf35f 100644 (file)
--- a/gdb/arc-tdep.c
+++ b/gdb/arc-tdep.c
@@ -22,7 +22,7 @@
 #include "defs.h"
 #include "arch-utils.h"
 #include "disasm.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "frame-base.h"
 #include "frame-unwind.h"
 #include "gdbcore.h"

diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 0e72bcc651a4b7fc1277e59a5b4dc1a29a5441e4..d4fed8977e702bb4c08327a37b705cae245dcf8c 100644 (file)
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -38,7 +38,7 @@
 #include "frame-base.h"
 #include "trad-frame.h"
 #include "objfiles.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "gdbtypes.h"
 #include "prologue-value.h"
 #include "remote.h"

diff --git a/gdb/bfin-tdep.c b/gdb/bfin-tdep.c
index 23591d4a5f0a017924a534f80718a060d73cc0d6..55fb6a61d6d6d5484678ee58003c5d7e14525669 100644 (file)
--- a/gdb/bfin-tdep.c
+++ b/gdb/bfin-tdep.c
@@ -31,7 +31,7 @@
 #include "dis-asm.h"
 #include "sim-regno.h"
 #include "gdb/sim-bfin.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "symtab.h"
 #include "elf-bfd.h"
 #include "elf/bfin.h"

diff --git a/gdb/compile/compile-c-symbols.c b/gdb/compile/compile-c-symbols.c
index 7af85d62cd40e17c7482efefed61b385814ea9cd..eb5af8e015fd18e8f1395a8e46dcc37d0eba4894 100644 (file)
--- a/gdb/compile/compile-c-symbols.c
+++ b/gdb/compile/compile-c-symbols.c
@@ -29,7 +29,7 @@
 #include "value.h"
 #include "exceptions.h"
 #include "gdbtypes.h"
-#include "dwarf2loc.h"
+#include "dwarf2/loc.h"
 
 \f
 

diff --git a/gdb/compile/compile-cplus-symbols.c b/gdb/compile/compile-cplus-symbols.c
index 34cae4a6d8f388ff5042aa59350cdd07c1b49a4d..fee2651e47ff5853ea8784caaea977b16a6c412f 100644 (file)
--- a/gdb/compile/compile-cplus-symbols.c
+++ b/gdb/compile/compile-cplus-symbols.c
@@ -30,7 +30,7 @@
 #include "value.h"
 #include "exceptions.h"
 #include "gdbtypes.h"
-#include "dwarf2loc.h"
+#include "dwarf2/loc.h"
 #include "cp-support.h"
 #include "gdbcmd.h"
 #include "compile-c.h"

diff --git a/gdb/compile/compile-loc2c.c b/gdb/compile/compile-loc2c.c
index 0f911821115b2febcfcd2c842f885d98dbedce88..636c929b02216dd4a969d58ddca8902b9601c176 100644 (file)
--- a/gdb/compile/compile-loc2c.c
+++ b/gdb/compile/compile-loc2c.c
@@ -19,15 +19,15 @@
 
 #include "defs.h"
 #include "dwarf2.h"
-#include "dwarf2expr.h"
-#include "dwarf2loc.h"
+#include "dwarf2/expr.h"
+#include "dwarf2/loc.h"
 #include "ui-file.h"
 #include "utils.h"
 #include "compile-internal.h"
 #include "compile-c.h"
 #include "compile.h"
 #include "block.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "gdbsupport/gdb_vecs.h"
 #include "value.h"
 #include "gdbarch.h"

diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c
index 6885d237f3a32c0e580b868d9a0319840b11f8a3..cc45a7f8ebfe0a9173ef107b7c4d3030f09137a4 100644 (file)
--- a/gdb/cris-tdep.c
+++ b/gdb/cris-tdep.c
@@ -25,7 +25,7 @@
 #include "frame-unwind.h"
 #include "frame-base.h"
 #include "trad-frame.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "symtab.h"
 #include "inferior.h"
 #include "gdbtypes.h"

diff --git a/gdb/csky-tdep.c b/gdb/csky-tdep.c
index 583298ce74c8007e2f5b22c64c683da16840af4a..955238bb014a34cf07720ca182812bf3718f5161 100644 (file)
--- a/gdb/csky-tdep.c
+++ b/gdb/csky-tdep.c
@@ -49,7 +49,7 @@
 #include "floatformat.h"
 #include "remote.h"
 #include "target-descriptions.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "user-regs.h"
 #include "valprint.h"
 #include "csky-tdep.h"

diff --git a/gdb/dwarf2/abbrev.c b/gdb/dwarf2/abbrev.c
index 6bd455f012b11ec240d4b7c3414c3273a8bdc006..544d5793add19859cd5795b8bc4fb04e1a1239ab 100644 (file)
--- a/gdb/dwarf2/abbrev.c
+++ b/gdb/dwarf2/abbrev.c
@@ -25,7 +25,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "dwarf2read.h"
+#include "dwarf2/read.h"
 #include "dwarf2/abbrev.h"
 #include "dwarf2/leb.h"
 #include "bfd.h"

diff --git a/gdb/dwarf2expr.c b/gdb/dwarf2/expr.c
similarity index 99%
rename from gdb/dwarf2expr.c
rename to gdb/dwarf2/expr.c
index ad82cbec2f7093b1a93560f95d3fb56295d88abd..243f493084b80c7429c4510c7dd0248a9e6e4c0a 100644 (file)
--- a/gdb/dwarf2expr.c
+++ b/gdb/dwarf2/expr.c
@@ -25,8 +25,8 @@
 #include "value.h"
 #include "gdbcore.h"
 #include "dwarf2.h"
-#include "dwarf2expr.h"
-#include "dwarf2loc.h"
+#include "dwarf2/expr.h"
+#include "dwarf2/loc.h"
 #include "gdbsupport/underlying.h"
 #include "gdbarch.h"
 

diff --git a/gdb/dwarf2expr.h b/gdb/dwarf2/expr.h
similarity index 100%
rename from gdb/dwarf2expr.h
rename to gdb/dwarf2/expr.h

diff --git a/gdb/dwarf2-frame-tailcall.c b/gdb/dwarf2/frame-tailcall.c
similarity index 99%
rename from gdb/dwarf2-frame-tailcall.c
rename to gdb/dwarf2/frame-tailcall.c
index fca1d3d0235b7da94d7775be4e3c3601851879d0..3dc300df60a9faad468db100c9c79eb7c97b5c63 100644 (file)
--- a/gdb/dwarf2-frame-tailcall.c
+++ b/gdb/dwarf2/frame-tailcall.c
@@ -19,15 +19,15 @@
 
 #include "defs.h"
 #include "frame.h"
-#include "dwarf2-frame-tailcall.h"
-#include "dwarf2loc.h"
+#include "dwarf2/frame-tailcall.h"
+#include "dwarf2/loc.h"
 #include "frame-unwind.h"
 #include "block.h"
 #include "hashtab.h"
 #include "gdbtypes.h"
 #include "regcache.h"
 #include "value.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "gdbarch.h"
 
 /* Contains struct tailcall_cache indexed by next_bottom_frame.  */

diff --git a/gdb/dwarf2-frame-tailcall.h b/gdb/dwarf2/frame-tailcall.h
similarity index 100%
rename from gdb/dwarf2-frame-tailcall.h
rename to gdb/dwarf2/frame-tailcall.h

diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2/frame.c
similarity index 99%
rename from gdb/dwarf2-frame.c
rename to gdb/dwarf2/frame.c
index 2bf827148ac1c765f7bea3848b8576a7eaf6262b..8cf136e5019b92663db9a862fcb5b53aeb2102ca 100644 (file)
--- a/gdb/dwarf2-frame.c
+++ b/gdb/dwarf2/frame.c
@@ -20,7 +20,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "dwarf2expr.h"
+#include "dwarf2/expr.h"
 #include "dwarf2.h"
 #include "dwarf2/leb.h"
 #include "frame.h"
@@ -35,11 +35,11 @@
 #include "record.h"
 
 #include "complaints.h"
-#include "dwarf2-frame.h"
-#include "dwarf2read.h"
+#include "dwarf2/frame.h"
+#include "dwarf2/read.h"
 #include "ax.h"
-#include "dwarf2loc.h"
-#include "dwarf2-frame-tailcall.h"
+#include "dwarf2/loc.h"
+#include "dwarf2/frame-tailcall.h"
 #include "gdbsupport/gdb_binary_search.h"
 #if GDB_SELF_TEST
 #include "gdbsupport/selftest.h"

diff --git a/gdb/dwarf2-frame.h b/gdb/dwarf2/frame.h
similarity index 100%
rename from gdb/dwarf2-frame.h
rename to gdb/dwarf2/frame.h

diff --git a/gdb/dwarf-index-cache.c b/gdb/dwarf2/index-cache.c
similarity index 99%
rename from gdb/dwarf-index-cache.c
rename to gdb/dwarf2/index-cache.c
index 977fcc1b20c2faa015fcf361cfb588920a09e54e..7b4d997590573589c3fa243e693d37eca31924c1 100644 (file)
--- a/gdb/dwarf-index-cache.c
+++ b/gdb/dwarf2/index-cache.c
@@ -18,15 +18,15 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "dwarf-index-cache.h"
+#include "dwarf2/index-cache.h"
 
 #include "build-id.h"
 #include "cli/cli-cmds.h"
 #include "command.h"
 #include "gdbsupport/scoped_mmap.h"
 #include "gdbsupport/pathstuff.h"
-#include "dwarf-index-write.h"
-#include "dwarf2read.h"
+#include "dwarf2/index-write.h"
+#include "dwarf2/read.h"
 #include "objfiles.h"
 #include "gdbsupport/selftest.h"
 #include <string>

diff --git a/gdb/dwarf-index-cache.h b/gdb/dwarf2/index-cache.h
similarity index 98%
rename from gdb/dwarf-index-cache.h
rename to gdb/dwarf2/index-cache.h
index bc1b30aa45fce5fd45fed92517753e22b84d2a40..07e93fa853c91fc37c8e113092f2a107b7c08091 100644 (file)
--- a/gdb/dwarf-index-cache.h
+++ b/gdb/dwarf2/index-cache.h
@@ -20,7 +20,7 @@
 #ifndef DWARF_INDEX_CACHE_H
 #define DWARF_INDEX_CACHE_H
 
-#include "dwarf-index-common.h"
+#include "dwarf2/index-common.h"
 #include "gdbsupport/array-view.h"
 #include "symfile.h"
 

diff --git a/gdb/dwarf-index-common.c b/gdb/dwarf2/index-common.c
similarity index 97%
rename from gdb/dwarf-index-common.c
rename to gdb/dwarf2/index-common.c
index 0baf869e41e0a04687123ec2ed7c0c93592bb7d3..13c6f0f8ab91e4b13300da0f1927d41983cd1439 100644 (file)
--- a/gdb/dwarf-index-common.c
+++ b/gdb/dwarf2/index-common.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "dwarf-index-common.h"
+#include "dwarf2/index-common.h"
 
 /* See dwarf-index-common.h.  */
 

diff --git a/gdb/dwarf-index-common.h b/gdb/dwarf2/index-common.h
similarity index 100%
rename from gdb/dwarf-index-common.h
rename to gdb/dwarf2/index-common.h

diff --git a/gdb/dwarf-index-write.c b/gdb/dwarf2/index-write.c
similarity index 99%
rename from gdb/dwarf-index-write.c
rename to gdb/dwarf2/index-write.c
index 4b2a3b07f47fafb56bdf32a18772751d2110085f..3c9ccbba46d30094f63e5ee268306bb7c2ed2526 100644 (file)
--- a/gdb/dwarf-index-write.c
+++ b/gdb/dwarf2/index-write.c
@@ -19,7 +19,7 @@
 
 #include "defs.h"
 
-#include "dwarf-index-write.h"
+#include "dwarf2/index-write.h"
 
 #include "addrmap.h"
 #include "cli/cli-decode.h"
@@ -29,9 +29,9 @@
 #include "gdbsupport/pathstuff.h"
 #include "gdbsupport/scoped_fd.h"
 #include "complaints.h"
-#include "dwarf-index-common.h"
+#include "dwarf2/index-common.h"
 #include "dwarf2.h"
-#include "dwarf2read.h"
+#include "dwarf2/read.h"
 #include "gdb/gdb-index.h"
 #include "gdbcmd.h"
 #include "objfiles.h"

diff --git a/gdb/dwarf-index-write.h b/gdb/dwarf2/index-write.h
similarity index 98%
rename from gdb/dwarf-index-write.h
rename to gdb/dwarf2/index-write.h
index d78ff2ac0735113b9422e4e6c1d8f01887d142a3..5ba17251a9f0d390eb287e448a52f9b7fcfbc78c 100644 (file)
--- a/gdb/dwarf-index-write.h
+++ b/gdb/dwarf2/index-write.h
@@ -21,7 +21,7 @@
 #define DWARF_INDEX_WRITE_H
 
 #include "symfile.h"
-#include "dwarf2read.h"
+#include "dwarf2/read.h"
 
 /* Create index files for OBJFILE in the directory DIR.
 

diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2/loc.c
similarity index 99%
rename from gdb/dwarf2loc.c
rename to gdb/dwarf2/loc.c
index 9cfc852c9e1bdedf297918b522d5c9042c1c591d..033336028206b49c97a43fde31982df7a35017b4 100644 (file)
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2/loc.c
@@ -34,10 +34,10 @@
 #include "gdbcmd.h"
 #include "complaints.h"
 #include "dwarf2.h"
-#include "dwarf2expr.h"
-#include "dwarf2loc.h"
-#include "dwarf2read.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/expr.h"
+#include "dwarf2/loc.h"
+#include "dwarf2/read.h"
+#include "dwarf2/frame.h"
 #include "dwarf2/leb.h"
 #include "compile/compile.h"
 #include "gdbsupport/selftest.h"

diff --git a/gdb/dwarf2loc.h b/gdb/dwarf2/loc.h
similarity index 99%
rename from gdb/dwarf2loc.h
rename to gdb/dwarf2/loc.h
index d0bc23b37d88e49de8df80e888867499dfc31ae9..a49a9903b11030d4e8a6f4cab0ad625edf8c61fe 100644 (file)
--- a/gdb/dwarf2loc.h
+++ b/gdb/dwarf2/loc.h
@@ -20,7 +20,7 @@
 #if !defined (DWARF2LOC_H)
 #define DWARF2LOC_H
 
-#include "dwarf2expr.h"
+#include "dwarf2/expr.h"
 
 struct symbol_computed_ops;
 struct objfile;

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2/read.c
similarity index 99%
rename from gdb/dwarf2read.c
rename to gdb/dwarf2/read.c
index 05311974793754c4d5dc5583cd46f4214dc64d21..f91e3647d7fd01521389c9f47f4491c427c3228f 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2/read.c
@@ -29,11 +29,11 @@
    E.g., load_partial_dies, read_partial_die.  */
 
 #include "defs.h"
-#include "dwarf2read.h"
+#include "dwarf2/read.h"
 #include "dwarf2/abbrev.h"
 #include "dwarf2/attribute.h"
-#include "dwarf-index-cache.h"
-#include "dwarf-index-common.h"
+#include "dwarf2/index-cache.h"
+#include "dwarf2/index-common.h"
 #include "dwarf2/leb.h"
 #include "bfd.h"
 #include "elf-bfd.h"
@@ -48,8 +48,8 @@
 #include "macrotab.h"
 #include "language.h"
 #include "complaints.h"
-#include "dwarf2expr.h"
-#include "dwarf2loc.h"
+#include "dwarf2/expr.h"
+#include "dwarf2/loc.h"
 #include "cp-support.h"
 #include "hashtab.h"
 #include "command.h"

diff --git a/gdb/dwarf2read.h b/gdb/dwarf2/read.h
similarity index 99%
rename from gdb/dwarf2read.h
rename to gdb/dwarf2/read.h
index 83da39f486a3a96758f95b019756a478c3b3df59..46256d0e14ddf5f2beda58636a5183381117e1ab 100644 (file)
--- a/gdb/dwarf2read.h
+++ b/gdb/dwarf2/read.h
@@ -21,7 +21,7 @@
 #define DWARF2READ_H
 
 #include <unordered_map>
-#include "dwarf-index-cache.h"
+#include "dwarf2/index-cache.h"
 #include "dwarf2/section.h"
 #include "filename-seen-cache.h"
 #include "gdb_obstack.h"

diff --git a/gdb/findvar.c b/gdb/findvar.c
index 5cf1cd4137b8bdaf8621e03845a8ad9674cdc625..a836c63dc5d3f31ee4663ea761d293676937403f 100644 (file)
--- a/gdb/findvar.c
+++ b/gdb/findvar.c
@@ -31,7 +31,7 @@
 #include "block.h"
 #include "objfiles.h"
 #include "language.h"
-#include "dwarf2loc.h"
+#include "dwarf2/loc.h"
 #include "gdbsupport/selftest.h"
 
 /* Basic byte-swapping routines.  All 'extract' functions return a

diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 1d5bfd4bc205319291cbed3be716b8537836e104..85758930491f92a6eaac8dc7a80e4eefd38d3afd 100644 (file)
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -36,7 +36,7 @@
 #include "hashtab.h"
 #include "cp-support.h"
 #include "bcache.h"
-#include "dwarf2loc.h"
+#include "dwarf2/loc.h"
 #include "gdbcore.h"
 #include "floatformat.h"
 

diff --git a/gdb/guile/scm-type.c b/gdb/guile/scm-type.c
index 52817ea4ede9b5d3597143c1dd5e90da95507cd9..bf2f751ce4d329b5ed2cb90eb9fe4b2ecc0f0e12 100644 (file)
--- a/gdb/guile/scm-type.c
+++ b/gdb/guile/scm-type.c
@@ -27,7 +27,7 @@
 #include "objfiles.h"
 #include "language.h"
 #include "bcache.h"
-#include "dwarf2loc.h"
+#include "dwarf2/loc.h"
 #include "typeprint.h"
 #include "guile-internal.h"
 

diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c
index 5e8ba94b72f8a489a25187415081ef2ed7321f18..79c74001bc81717e843b09c67eb63a6205d7da1a 100644 (file)
--- a/gdb/h8300-tdep.c
+++ b/gdb/h8300-tdep.c
@@ -29,7 +29,7 @@
 #include "gdbcore.h"
 #include "objfiles.h"
 #include "dis-asm.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "frame-base.h"
 #include "frame-unwind.h"
 

diff --git a/gdb/hppa-bsd-tdep.c b/gdb/hppa-bsd-tdep.c
index 3994167a3ad9ce58535227928af3aa75a6cd99a6..d116a58c6cee5aeff71dfa6346ecd6c3934d82e9 100644 (file)
--- a/gdb/hppa-bsd-tdep.c
+++ b/gdb/hppa-bsd-tdep.c
@@ -26,7 +26,7 @@
 
 #include "hppa-tdep.h"
 #include "hppa-bsd-tdep.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "solib-svr4.h"
 
 static CORE_ADDR

diff --git a/gdb/hppa-linux-tdep.c b/gdb/hppa-linux-tdep.c
index 51c84d8e4f0da005b24966878d2ed849b6f287d1..6a38d7200bec2b55388fc1a15b2f34d471f55f09 100644 (file)
--- a/gdb/hppa-linux-tdep.c
+++ b/gdb/hppa-linux-tdep.c
@@ -26,7 +26,7 @@
 #include "glibc-tdep.h"
 #include "frame-unwind.h"
 #include "trad-frame.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "value.h"
 #include "regset.h"
 #include "regcache.h"

diff --git a/gdb/i386-darwin-tdep.c b/gdb/i386-darwin-tdep.c
index a1c226ba66fa81fbf6cd55b9db8ed06317081583..a796a8544f0b2da2538eac6db047f6da4594aa76 100644 (file)
--- a/gdb/i386-darwin-tdep.c
+++ b/gdb/i386-darwin-tdep.c
@@ -34,7 +34,7 @@
 #include "i386-darwin-tdep.h"
 #include "solib.h"
 #include "solib-darwin.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include <algorithm>
 
 /* Offsets into the struct i386_thread_state where we'll find the saved regs.

diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c
index 6f702b59e7f8fac4c4e8e6ac4239297d91872d28..f4a5f0a7616176db26f3bb911157a0ae897548b6 100644 (file)
--- a/gdb/i386-linux-tdep.c
+++ b/gdb/i386-linux-tdep.c
@@ -26,7 +26,7 @@
 #include "inferior.h"
 #include "osabi.h"
 #include "reggroups.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "i386-tdep.h"
 #include "i386-linux-tdep.h"
 #include "linux-tdep.h"

diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index f120438081ded6967ebfd59e65c0659a8bd30622..f71444f6528665564486de9400fbbb77f696476c 100644 (file)
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -22,7 +22,7 @@
 #include "arch-utils.h"
 #include "command.h"
 #include "dummy-frame.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "frame.h"
 #include "frame-base.h"
 #include "frame-unwind.h"

diff --git a/gdb/iq2000-tdep.c b/gdb/iq2000-tdep.c
index 4b3419ead7b64df3cd2c8d75942e18b583d03c60..7864d810d75575846a5046e479442d16d5524546 100644 (file)
--- a/gdb/iq2000-tdep.c
+++ b/gdb/iq2000-tdep.c
@@ -24,7 +24,7 @@
 #include "frame.h"
 #include "frame-base.h"
 #include "frame-unwind.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "gdbtypes.h"
 #include "value.h"
 #include "dis-asm.h"

diff --git a/gdb/m32c-tdep.c b/gdb/m32c-tdep.c
index 31f4d24cac5d192731957c5a8e074d7eaa4f8329..585fa3377457dd010e16a1058f9e124f6eb94eda 100644 (file)
--- a/gdb/m32c-tdep.c
+++ b/gdb/m32c-tdep.c
@@ -27,8 +27,8 @@
 #include "arch-utils.h"
 #include "frame.h"
 #include "frame-unwind.h"
-#include "dwarf2-frame.h"
-#include "dwarf2expr.h"
+#include "dwarf2/frame.h"
+#include "dwarf2/expr.h"
 #include "symtab.h"
 #include "gdbcore.h"
 #include "value.h"

diff --git a/gdb/m68hc11-tdep.c b/gdb/m68hc11-tdep.c
index 4e63c2f2fa0d7e67037060664bb19173a4a47a17..fb3b18ac7184e4ae1d2a62ae2f1c189621906e05 100644 (file)
--- a/gdb/m68hc11-tdep.c
+++ b/gdb/m68hc11-tdep.c
@@ -24,7 +24,7 @@
 #include "frame.h"
 #include "frame-unwind.h"
 #include "frame-base.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "trad-frame.h"
 #include "symtab.h"
 #include "gdbtypes.h"

diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c
index ec754a62af937fbef63d3e5e0ee78a5836a4b76a..5ed5087da1fe5e55548b6d5dc797783afa63dde8 100644 (file)
--- a/gdb/m68k-tdep.c
+++ b/gdb/m68k-tdep.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "frame.h"
 #include "frame-base.h"
 #include "frame-unwind.h"

diff --git a/gdb/microblaze-tdep.c b/gdb/microblaze-tdep.c
index a05088c36a10aea5af649b4dd713ef7c6a5a8f53..5c804133040df7ab0e9f03fecaffc0f4c3912279 100644 (file)
--- a/gdb/microblaze-tdep.c
+++ b/gdb/microblaze-tdep.c
@@ -31,7 +31,7 @@
 #include "target.h"
 #include "frame-base.h"
 #include "frame-unwind.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 #include "opcodes/microblaze-opcm.h"

diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 90ec3707c5db8c21c739e6d58f38db881be756ea..2599f825e83d9c0b0dcccdfc8e03ffbc223852cd 100644 (file)
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -51,7 +51,7 @@
 #include "infcall.h"
 #include "remote.h"
 #include "target-descriptions.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "user-regs.h"
 #include "valprint.h"
 #include "ax.h"

diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c
index d779ad1dd0d8621220fbe5895f32b85fd392f605..8e487241e7045d0c4025f7fcb9574098998ed88c 100644 (file)
--- a/gdb/mn10300-tdep.c
+++ b/gdb/mn10300-tdep.c
@@ -28,7 +28,7 @@
 #include "frame-unwind.h"
 #include "frame-base.h"
 #include "symtab.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "osabi.h"
 #include "infcall.h"
 #include "prologue-value.h"

diff --git a/gdb/msp430-tdep.c b/gdb/msp430-tdep.c
index 0893274686ee3c297d285e6289a05259808a1cb3..88597660b5364dc7616ff582ae40702e9a58a93f 100644 (file)
--- a/gdb/msp430-tdep.c
+++ b/gdb/msp430-tdep.c
@@ -32,7 +32,7 @@
 #include "frame-base.h"
 #include "value.h"
 #include "gdbcore.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "reggroups.h"
 
 #include "elf/msp430.h"

diff --git a/gdb/nds32-tdep.c b/gdb/nds32-tdep.c
index 5238fe54a71bb11e18e83433066aaa4c0e4329a0..220ad1e968d7ab7f8426dfc97042483c51c084dd 100644 (file)
--- a/gdb/nds32-tdep.c
+++ b/gdb/nds32-tdep.c
@@ -34,7 +34,7 @@
 #include "dis-asm.h"
 #include "user-regs.h"
 #include "elf-bfd.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "remote.h"
 #include "target-descriptions.h"
 

diff --git a/gdb/nios2-tdep.c b/gdb/nios2-tdep.c
index cb669da24802bdfcc1d37a99a4f6d4e8801b885c..02cdaea738ecd5bf019a9025f877c7d6be62e36f 100644 (file)
--- a/gdb/nios2-tdep.c
+++ b/gdb/nios2-tdep.c
@@ -24,7 +24,7 @@
 #include "frame-unwind.h"
 #include "frame-base.h"
 #include "trad-frame.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "symtab.h"
 #include "inferior.h"
 #include "gdbtypes.h"

diff --git a/gdb/or1k-tdep.c b/gdb/or1k-tdep.c
index 772ecff3349192b7fd754bd8fd1f8bc5eb375ac8..61901a7689e217e5b8be42ba018103735722b5b5 100644 (file)
--- a/gdb/or1k-tdep.c
+++ b/gdb/or1k-tdep.c
@@ -35,7 +35,7 @@
 #include "arch-utils.h"
 #include "frame-unwind.h"
 #include "frame-base.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "trad-frame.h"
 #include "regset.h"
 #include "remote.h"

diff --git a/gdb/riscv-tdep.c b/gdb/riscv-tdep.c
index d585b0be5ab031cf740245528cdf764295dbd1ae..a14ef4db0830465e773b8e41a61283d6b9d57ee4 100644 (file)
--- a/gdb/riscv-tdep.c
+++ b/gdb/riscv-tdep.c
@@ -47,7 +47,7 @@
 #include "floatformat.h"
 #include "remote.h"
 #include "target-descriptions.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "user-regs.h"
 #include "valprint.h"
 #include "gdbsupport/common-defs.h"

diff --git a/gdb/rl78-tdep.c b/gdb/rl78-tdep.c
index 3705efdbe89a59b55d806a7187274fbab979e763..aca7649fe06aeb584c7f9b494a4e85db57d614dd 100644 (file)
--- a/gdb/rl78-tdep.c
+++ b/gdb/rl78-tdep.c
@@ -32,7 +32,7 @@
 #include "frame-base.h"
 #include "value.h"
 #include "gdbcore.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "reggroups.h"
 
 #include "elf/rl78.h"

diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index ccffc39508a6ac1627f5dff3945c0f4f3dc2237b..919bebc71b2254b16a3886113d9a0e4c3b4585f3 100644 (file)
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -37,7 +37,7 @@
 #include "sim-regno.h"
 #include "gdb/sim-ppc.h"
 #include "reggroups.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "target-descriptions.h"
 #include "user-regs.h"
 #include "record-full.h"

diff --git a/gdb/rx-tdep.c b/gdb/rx-tdep.c
index 766eaa06ed3e6d849e5b07774e28fa450dca1306..c14ce20282c21eb9c486191fc7306b8c74e0e473 100644 (file)
--- a/gdb/rx-tdep.c
+++ b/gdb/rx-tdep.c
@@ -32,7 +32,7 @@
 #include "frame-base.h"
 #include "value.h"
 #include "gdbcore.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "remote.h"
 #include "target-descriptions.h"
 

diff --git a/gdb/s12z-tdep.c b/gdb/s12z-tdep.c
index 922268d1ef21bf897b7bb856f4eaa7bf7d6732fe..4d2febadc9b6d62bedb3b7196fa184dd1a68e975 100644 (file)
--- a/gdb/s12z-tdep.c
+++ b/gdb/s12z-tdep.c
@@ -21,7 +21,7 @@
 #include "defs.h"
 
 #include "arch-utils.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "gdbsupport/errors.h"
 #include "frame-unwind.h"
 #include "gdbcore.h"

diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c
index e01505549e678ffa143ec4a556475a4c135cb453..5f3cb7e81e757475a138dd6cb586968922760e93 100644 (file)
--- a/gdb/s390-tdep.c
+++ b/gdb/s390-tdep.c
@@ -21,7 +21,7 @@
 
 #include "arch-utils.h"
 #include "ax-gdb.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "elf/s390.h"
 #include "elf-bfd.h"
 #include "frame-base.h"

diff --git a/gdb/score-tdep.c b/gdb/score-tdep.c
index 14eeee9eb8c109033fa10c3a9503b7d231774ca9..c5c183628ab2f45d0669a761c39b3efc45ae48ec 100644 (file)
--- a/gdb/score-tdep.c
+++ b/gdb/score-tdep.c
@@ -34,7 +34,7 @@
 #include "frame-unwind.h"
 #include "frame-base.h"
 #include "trad-frame.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "score-tdep.h"
 
 #define G_FLD(_i,_ms,_ls) \

diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c
index b69313d050ff750d6ff307695c724278d86cd115..9e831fb42e07d132e7865f863da3c6780febf07c 100644 (file)
--- a/gdb/sh-tdep.c
+++ b/gdb/sh-tdep.c
@@ -24,7 +24,7 @@
 #include "frame.h"
 #include "frame-base.h"
 #include "frame-unwind.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "gdbcmd.h"

diff --git a/gdb/sparc-linux-tdep.c b/gdb/sparc-linux-tdep.c
index 1c4adb836745f5c698f188f84dca0792b2252329..247fde21657c41fbde076256e106c5b207f131a1 100644 (file)
--- a/gdb/sparc-linux-tdep.c
+++ b/gdb/sparc-linux-tdep.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "frame.h"
 #include "frame-unwind.h"
 #include "gdbtypes.h"

diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
index e048f872c2a28d580a70bb85c7cc76f1dc72bf47..a0c41722440997ee12b8ee9ce2efe040f73a2513 100644 (file)
--- a/gdb/sparc-tdep.c
+++ b/gdb/sparc-tdep.c
@@ -21,7 +21,7 @@
 #include "arch-utils.h"
 #include "dis-asm.h"
 #include "dwarf2.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "frame.h"
 #include "frame-base.h"
 #include "frame-unwind.h"

diff --git a/gdb/sparc64-linux-tdep.c b/gdb/sparc64-linux-tdep.c
index de6c04790099b769005380d7eac298016505dda4..a7f439fbb04dcc001181b719ac2f94ffa0f310e2 100644 (file)
--- a/gdb/sparc64-linux-tdep.c
+++ b/gdb/sparc64-linux-tdep.c
@@ -20,7 +20,7 @@
 #include "defs.h"
 #include "frame.h"
 #include "frame-unwind.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "regset.h"
 #include "regcache.h"
 #include "gdbarch.h"

diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c
index a11da6ab2e8070a2b4642929ba53a852817c47c3..ac915d468fd353167a557d120cd0cbe81bb2265c 100644 (file)
--- a/gdb/sparc64-tdep.c
+++ b/gdb/sparc64-tdep.c
@@ -19,7 +19,7 @@
 
 #include "defs.h"
 #include "arch-utils.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "frame.h"
 #include "frame-base.h"
 #include "frame-unwind.h"

diff --git a/gdb/tic6x-tdep.c b/gdb/tic6x-tdep.c
index a05675c570ccd8ee6a088c117ee0f6e006653048..50031c100a5251177d4fc50d0376b4bb269408dc 100644 (file)
--- a/gdb/tic6x-tdep.c
+++ b/gdb/tic6x-tdep.c
@@ -24,7 +24,7 @@
 #include "frame-unwind.h"
 #include "frame-base.h"
 #include "trad-frame.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "symtab.h"
 #include "inferior.h"
 #include "gdbtypes.h"

diff --git a/gdb/tilegx-tdep.c b/gdb/tilegx-tdep.c
index 9290bc3878b7677e001f266d2b554a9b6ef7edad..70c4add90b1c96cfbde4c97511df31d62b9a0996 100644 (file)
--- a/gdb/tilegx-tdep.c
+++ b/gdb/tilegx-tdep.c
@@ -21,7 +21,7 @@
 #include "frame.h"
 #include "frame-base.h"
 #include "frame-unwind.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "trad-frame.h"
 #include "symtab.h"
 #include "gdbtypes.h"

diff --git a/gdb/v850-tdep.c b/gdb/v850-tdep.c
index 9b2e9b62e7174ada8f86aedcd6987e6e1acf5cc1..fd5a9ff4587cf917015d851f1a0886a41dfa3e0c 100644 (file)
--- a/gdb/v850-tdep.c
+++ b/gdb/v850-tdep.c
@@ -22,7 +22,7 @@
 #include "frame-base.h"
 #include "trad-frame.h"
 #include "frame-unwind.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "gdbtypes.h"
 #include "inferior.h"
 #include "gdbcore.h"

diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c
index 0206af8bebc5fa1e64c75f074b2b5293a40c1e43..1715dc81e38a88a48bc55386f06304e9763eff99 100644 (file)
--- a/gdb/xstormy16-tdep.c
+++ b/gdb/xstormy16-tdep.c
@@ -21,7 +21,7 @@
 #include "frame.h"
 #include "frame-base.h"
 #include "frame-unwind.h"
-#include "dwarf2-frame.h"
+#include "dwarf2/frame.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "gdbcmd.h"

diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
index bbd92d5cf8f0d52891005a5baaa40045240ebc93..2ea11212601bf1a30219a8e52d1ccead1835746c 100644 (file)
--- a/gdb/xtensa-tdep.c
+++ b/gdb/xtensa-tdep.c
@@ -35,8 +35,8 @@
 
 #include "dummy-frame.h"
 #include "dwarf2.h"
-#include "dwarf2-frame.h"
-#include "dwarf2loc.h"
+#include "dwarf2/frame.h"
+#include "dwarf2/loc.h"
 #include "frame-base.h"
 #include "frame-unwind.h"