bfd

	* Makefile.am (dwarf2.lo): Use dwarf2.h, not elf/dwarf2.h.
	(elf-eh-frame.lo): Likewise.
	(elf32-bfin.lo): Likewise.
	(elf32-frv.lo): Likewise.
	(elf32-xc16x.lo): Likewise.
	* Makefile.in: Rebuild.
	* dwarf2.c: Included dwarf.h, not elf/dwarf2.h.
	* elf-eh-frame.c: Likewise.
	* elf32-bfin.c: Likewise.
	* elf32-frv.c: Likewise.
	* elf32-xc16x.c: Likewise.
binutils
	* Makefile.am (dwarf.o): Refer to dwarf2.h, not elf/dwarf2.h.
	* Makefile.in: Rebuild.
	* dwarf.c: Include dwarf2.h, not elf/dwarf2.h.
gas
	* Makefile.am (DEPTC_alpha_ecoff): Refer to dwarf2.h, not
	elf/dwarf2.h.
	(DEPTC_alpha_elf): Likewise.
	(DEPTC_alpha_evax): Likewise.
	(DEPTC_arm_elf): Likewise.
	(DEPTC_hppa_elf): Likewise.
	(DEPTC_i386_aout): Likewise.
	(DEPTC_i386_coff): Likewise.
	(DEPTC_i386_elf): Likewise.
	(DEPTC_m68k_aout): Likewise.
	(DEPTC_m68k_coff): Likewise.
	(DEPTC_m68k_elf): Likewise.
	(DEPTC_mips_coff): Likewise.
	(DEPTC_mips_ecoff): Likewise.
	(DEPTC_mips_elf): Likewise.
	(DEPTC_ppc_coff): Likewise.
	(DEPTC_ppc_elf): Likewise.
	(DEPTC_s390_elf): Likewise.
	(DEPTC_sh_coff): Likewise.
	(DEPTC_sh_elf): Likewise.
	(DEPTC_sh64_elf): Likewise.
	(DEPTC_sparc_aout): Likewise.
	(DEPTC_sparc_coff): Likewise.
	(DEPTC_sparc_elf): Likewise.
	(as.o): Likewise.
	(dwarf2dbg.o): Likewise.
	(dw2gencfi.o): Likewise.
	(ehopt.o): Likewise.
	(read.o): Likewise.
	* Makefile.in: Rebuild.
	* dw2gencfi.h: Include dwarf2.h, not elf/dwarf2.h.
	* dwarf2dbg.c: Likewise.
	* ehopt.c: Likewise.
gdb
	* dwarf2-frame.c: Include dwarf2.h, not elf/dwarf2.h.
	* dwarf2expr.c: Likewise.
	* dwarf2loc.c: Likewise.
	* dwarf2read.c: Likewise.
	* sh-tdep.c: Likewise.
	* xtensa-tdep.c: Likewise.
include
	* dwarf2.h: New file, moved from elf/.
include/elf

	* dwarf2.h: Move to `..'.

6 files changed, 95 insertions, 59 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 29688d8..85e66cb 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,39 @@
+2009-07-10  Tom Tromey  <tromey@redhat.com>
+
+	* Makefile.am (DEPTC_alpha_ecoff): Refer to dwarf2.h, not
+	elf/dwarf2.h.
+	(DEPTC_alpha_elf): Likewise.
+	(DEPTC_alpha_evax): Likewise.
+	(DEPTC_arm_elf): Likewise.
+	(DEPTC_hppa_elf): Likewise.
+	(DEPTC_i386_aout): Likewise.
+	(DEPTC_i386_coff): Likewise.
+	(DEPTC_i386_elf): Likewise.
+	(DEPTC_m68k_aout): Likewise.
+	(DEPTC_m68k_coff): Likewise.
+	(DEPTC_m68k_elf): Likewise.
+	(DEPTC_mips_coff): Likewise.
+	(DEPTC_mips_ecoff): Likewise.
+	(DEPTC_mips_elf): Likewise.
+	(DEPTC_ppc_coff): Likewise.
+	(DEPTC_ppc_elf): Likewise.
+	(DEPTC_s390_elf): Likewise.
+	(DEPTC_sh_coff): Likewise.
+	(DEPTC_sh_elf): Likewise.
+	(DEPTC_sh64_elf): Likewise.
+	(DEPTC_sparc_aout): Likewise.
+	(DEPTC_sparc_coff): Likewise.
+	(DEPTC_sparc_elf): Likewise.
+	(as.o): Likewise.
+	(dwarf2dbg.o): Likewise.
+	(dw2gencfi.o): Likewise.
+	(ehopt.o): Likewise.
+	(read.o): Likewise.
+	* Makefile.in: Rebuild.
+	* dw2gencfi.h: Include dwarf2.h, not elf/dwarf2.h.
+	* dwarf2dbg.c: Likewise.
+	* ehopt.c: Likewise.
+
 2009-07-09  Daniel Gutson  <dgutson@codesourcery.com>
 
 	* config/tc-arm.c (it_fsm_post_encode): New forward declaration.
diff --git a/gas/Makefile.am b/gas/Makefile.am
index 8e8c8cc..56cd4a6 100644
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -1094,7 +1094,7 @@ DEPTC_alpha_ecoff = \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/coff/ecoff.h \
   $(INCDIR)/coff/sym.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/obstack.h \
   $(INCDIR)/opcode/alpha.h \
   $(INCDIR)/safe-ctype.h \
@@ -1114,7 +1114,7 @@ DEPTC_alpha_elf = \
   $(INCDIR)/coff/sym.h \
   $(INCDIR)/elf/alpha.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
@@ -1132,7 +1132,7 @@ DEPTC_alpha_elf = \
 DEPTC_alpha_evax = \
   $(BFDDIR)/vms.h \
   $(INCDIR)/alloca-conf.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/obstack.h \
   $(INCDIR)/opcode/alpha.h \
   $(INCDIR)/safe-ctype.h \
@@ -1193,7 +1193,7 @@ DEPTC_arm_elf = \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/arm.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
@@ -1407,7 +1407,7 @@ DEPTC_hppa_elf = \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/hppa.h \
   $(INCDIR)/elf/internal.h \
@@ -1441,7 +1441,7 @@ DEPTC_i386_aout = \
   $(BFDDIR)/libaout.h \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/reloc-macros.h \
   $(INCDIR)/elf/x86-64.h \
   $(INCDIR)/obstack.h \
@@ -1462,7 +1462,7 @@ DEPTC_i386_coff = \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/i386.h \
   $(INCDIR)/coff/internal.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/reloc-macros.h \
   $(INCDIR)/elf/x86-64.h \
   $(INCDIR)/obstack.h \
@@ -1481,7 +1481,7 @@ DEPTC_i386_elf = \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
@@ -1660,7 +1660,7 @@ DEPTC_m68k_aout = \
   $(BFDDIR)/libaout.h \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/obstack.h \
   $(INCDIR)/opcode/m68k.h \
   $(INCDIR)/safe-ctype.h \
@@ -1677,7 +1677,7 @@ DEPTC_m68k_coff = \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/m68k.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/obstack.h \
   $(INCDIR)/opcode/m68k.h \
   $(INCDIR)/safe-ctype.h \
@@ -1692,7 +1692,7 @@ DEPTC_m68k_elf = \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/m68k.h \
@@ -1783,7 +1783,7 @@ DEPTC_mips_coff = \
   $(INCDIR)/coff/mipspe.h \
   $(INCDIR)/coff/sym.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/mips.h \
@@ -1806,7 +1806,7 @@ DEPTC_mips_ecoff = \
   $(INCDIR)/coff/ecoff.h \
   $(INCDIR)/coff/sym.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/mips.h \
@@ -1829,7 +1829,7 @@ DEPTC_mips_elf = \
   $(INCDIR)/coff/ecoff.h \
   $(INCDIR)/coff/sym.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/mips.h \
@@ -2012,7 +2012,7 @@ DEPTC_ppc_coff = \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/rs6000.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/obstack.h \
   $(INCDIR)/opcode/ppc.h \
   $(INCDIR)/safe-ctype.h \
@@ -2025,7 +2025,7 @@ DEPTC_ppc_elf = \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/ppc.h \
@@ -2043,7 +2043,7 @@ DEPTC_s390_elf = \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
@@ -2082,7 +2082,7 @@ DEPTC_sh_coff = \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/sh.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/obstack.h \
   $(INCDIR)/safe-ctype.h \
   $(srcdir)/../opcodes/sh-opc.h \
@@ -2097,7 +2097,7 @@ DEPTC_sh_elf = \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
@@ -2117,7 +2117,7 @@ DEPTC_sh64_elf = \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
@@ -2138,7 +2138,7 @@ DEPTC_sparc_aout = \
   $(BFDDIR)/libaout.h \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/obstack.h \
   $(INCDIR)/opcode/sparc.h \
   $(INCDIR)/safe-ctype.h \
@@ -2153,7 +2153,7 @@ DEPTC_sparc_coff = \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/sparc.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/obstack.h \
   $(INCDIR)/opcode/sparc.h \
   $(INCDIR)/safe-ctype.h \
@@ -2166,7 +2166,7 @@ DEPTC_sparc_elf = \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
@@ -4296,7 +4296,7 @@ app.o: \
 as.o: \
   as.c \
   $(INCDIR)/alloca-conf.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/obstack.h \
   ../bfd/bfdver.h \
   dw2gencfi.h \
@@ -4321,7 +4321,7 @@ depend.o: \
 dwarf2dbg.o: \
   dwarf2dbg.c \
   $(INCDIR)/alloca-conf.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/obstack.h \
   $(INCDIR)/safe-ctype.h \
@@ -4330,7 +4330,7 @@ dwarf2dbg.o: \
 dw2gencfi.o: \
   dw2gencfi.c \
   $(INCDIR)/alloca-conf.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/obstack.h \
   dw2gencfi.h \
   subsegs.h
@@ -4341,7 +4341,7 @@ ecoff.o: \
 ehopt.o: \
   ehopt.c \
   $(INCDIR)/alloca-conf.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/obstack.h \
   struc-symbol.h \
   subsegs.h
@@ -4406,7 +4406,7 @@ output-file.o: \
 read.o: \
   read.c \
   $(INCDIR)/alloca-conf.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/obstack.h \
   $(INCDIR)/safe-ctype.h \
   dw2gencfi.h \
diff --git a/gas/Makefile.in b/gas/Makefile.in
index 6e314d9..032440d 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -819,7 +819,7 @@ DEPTC_alpha_ecoff = \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/coff/ecoff.h \
   $(INCDIR)/coff/sym.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/obstack.h \
   $(INCDIR)/opcode/alpha.h \
   $(INCDIR)/safe-ctype.h \
@@ -840,7 +840,7 @@ DEPTC_alpha_elf = \
   $(INCDIR)/coff/sym.h \
   $(INCDIR)/elf/alpha.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
@@ -859,7 +859,7 @@ DEPTC_alpha_elf = \
 DEPTC_alpha_evax = \
   $(BFDDIR)/vms.h \
   $(INCDIR)/alloca-conf.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/obstack.h \
   $(INCDIR)/opcode/alpha.h \
   $(INCDIR)/safe-ctype.h \
@@ -924,7 +924,7 @@ DEPTC_arm_elf = \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/arm.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
@@ -1152,7 +1152,7 @@ DEPTC_hppa_elf = \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/hppa.h \
   $(INCDIR)/elf/internal.h \
@@ -1188,7 +1188,7 @@ DEPTC_i386_aout = \
   $(BFDDIR)/libaout.h \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/reloc-macros.h \
   $(INCDIR)/elf/x86-64.h \
   $(INCDIR)/obstack.h \
@@ -1210,7 +1210,7 @@ DEPTC_i386_coff = \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/i386.h \
   $(INCDIR)/coff/internal.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/reloc-macros.h \
   $(INCDIR)/elf/x86-64.h \
   $(INCDIR)/obstack.h \
@@ -1230,7 +1230,7 @@ DEPTC_i386_elf = \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
@@ -1419,7 +1419,7 @@ DEPTC_m68k_aout = \
   $(BFDDIR)/libaout.h \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/obstack.h \
   $(INCDIR)/opcode/m68k.h \
   $(INCDIR)/safe-ctype.h \
@@ -1437,7 +1437,7 @@ DEPTC_m68k_coff = \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/m68k.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/obstack.h \
   $(INCDIR)/opcode/m68k.h \
   $(INCDIR)/safe-ctype.h \
@@ -1453,7 +1453,7 @@ DEPTC_m68k_elf = \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/m68k.h \
@@ -1549,7 +1549,7 @@ DEPTC_mips_coff = \
   $(INCDIR)/coff/mipspe.h \
   $(INCDIR)/coff/sym.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/mips.h \
@@ -1573,7 +1573,7 @@ DEPTC_mips_ecoff = \
   $(INCDIR)/coff/ecoff.h \
   $(INCDIR)/coff/sym.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/mips.h \
@@ -1597,7 +1597,7 @@ DEPTC_mips_elf = \
   $(INCDIR)/coff/ecoff.h \
   $(INCDIR)/coff/sym.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/mips.h \
@@ -1793,7 +1793,7 @@ DEPTC_ppc_coff = \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/rs6000.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/obstack.h \
   $(INCDIR)/opcode/ppc.h \
   $(INCDIR)/safe-ctype.h \
@@ -1807,7 +1807,7 @@ DEPTC_ppc_elf = \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/ppc.h \
@@ -1826,7 +1826,7 @@ DEPTC_s390_elf = \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
@@ -1867,7 +1867,7 @@ DEPTC_sh_coff = \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/sh.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/obstack.h \
   $(INCDIR)/safe-ctype.h \
   $(srcdir)/../opcodes/sh-opc.h \
@@ -1883,7 +1883,7 @@ DEPTC_sh_elf = \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
@@ -1904,7 +1904,7 @@ DEPTC_sh64_elf = \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
@@ -1926,7 +1926,7 @@ DEPTC_sparc_aout = \
   $(BFDDIR)/libaout.h \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/obstack.h \
   $(INCDIR)/opcode/sparc.h \
   $(INCDIR)/safe-ctype.h \
@@ -1942,7 +1942,7 @@ DEPTC_sparc_coff = \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/sparc.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/obstack.h \
   $(INCDIR)/opcode/sparc.h \
   $(INCDIR)/safe-ctype.h \
@@ -1956,7 +1956,7 @@ DEPTC_sparc_elf = \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
@@ -5152,7 +5152,7 @@ app.o: \
 as.o: \
   as.c \
   $(INCDIR)/alloca-conf.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/obstack.h \
   ../bfd/bfdver.h \
   dw2gencfi.h \
@@ -5177,7 +5177,7 @@ depend.o: \
 dwarf2dbg.o: \
   dwarf2dbg.c \
   $(INCDIR)/alloca-conf.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/obstack.h \
   $(INCDIR)/safe-ctype.h \
@@ -5186,7 +5186,7 @@ dwarf2dbg.o: \
 dw2gencfi.o: \
   dw2gencfi.c \
   $(INCDIR)/alloca-conf.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/obstack.h \
   dw2gencfi.h \
   subsegs.h
@@ -5197,7 +5197,7 @@ ecoff.o: \
 ehopt.o: \
   ehopt.c \
   $(INCDIR)/alloca-conf.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/obstack.h \
   struc-symbol.h \
   subsegs.h
@@ -5262,7 +5262,7 @@ output-file.o: \
 read.o: \
   read.c \
   $(INCDIR)/alloca-conf.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/obstack.h \
   $(INCDIR)/safe-ctype.h \
   dw2gencfi.h \
diff --git a/gas/dw2gencfi.h b/gas/dw2gencfi.h
index 307fbb7..9f9569c 100644
--- a/gas/dw2gencfi.h
+++ b/gas/dw2gencfi.h
@@ -22,7 +22,7 @@
 #ifndef DW2GENCFI_H
 #define DW2GENCFI_H
 
-#include "elf/dwarf2.h"
+#include "dwarf2.h"
 
 struct symbol;
 
diff --git a/gas/dwarf2dbg.c b/gas/dwarf2dbg.c
index 66d6b6e..de56095 100644
--- a/gas/dwarf2dbg.c
+++ b/gas/dwarf2dbg.c
@@ -91,7 +91,7 @@
 
 #include "subsegs.h"
 
-#include "elf/dwarf2.h"
+#include "dwarf2.h"
 
 /* Since we can't generate the prolog until the body is complete, we
    use three different subsegments for .debug_line: one holding the
diff --git a/gas/ehopt.c b/gas/ehopt.c
index b3789d8..ece0f2b 100644
--- a/gas/ehopt.c
+++ b/gas/ehopt.c
@@ -28,7 +28,7 @@
    ELF, since the exception frame information is always in a format
    derived from DWARF.  */
 
-#include "elf/dwarf2.h"
+#include "dwarf2.h"
 
 /* Try to optimize gcc 2.8 exception frame information.