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 `..'.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 2fed91d..3e958a9 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,17 @@
+2009-07-10  Tom Tromey  <tromey@redhat.com>
+
+       * 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.
+
 2009-07-10  Julian Brown  <julian@codesourcery.com>
 
        * elf32-arm.c (arm_build_one_stub): Use the hash entry of the

diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index 13da4ef..d487d85 100644 (file)
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -1205,7 +1205,7 @@ dwarf2.lo: \
   dwarf2.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/filenames.h \
@@ -2042,7 +2042,7 @@ elf-eh-frame.lo: \
   elf-eh-frame.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/filenames.h \
@@ -2174,7 +2174,7 @@ elf32-bfin.lo: \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/bfin.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 \
@@ -2283,7 +2283,7 @@ elf32-frv.lo: \
   elf32-frv.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/frv.h \
   $(INCDIR)/elf/internal.h \
@@ -2777,7 +2777,7 @@ elf32-xc16x.lo: \
   elf32-xc16x.c \
   $(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 \

diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 45e184a..d01adde 100644 (file)
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -1806,7 +1806,7 @@ dwarf2.lo: \
   dwarf2.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/filenames.h \
@@ -2643,7 +2643,7 @@ elf-eh-frame.lo: \
   elf-eh-frame.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/filenames.h \
@@ -2775,7 +2775,7 @@ elf32-bfin.lo: \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/bfin.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 \
@@ -2884,7 +2884,7 @@ elf32-frv.lo: \
   elf32-frv.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/frv.h \
   $(INCDIR)/elf/internal.h \
@@ -3378,7 +3378,7 @@ elf32-xc16x.lo: \
   elf32-xc16x.c \
   $(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 \

diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
index e88a6af..3085180 100644 (file)
--- a/bfd/dwarf2.c
+++ b/bfd/dwarf2.c
@@ -35,7 +35,7 @@
 #include "libiberty.h"
 #include "libbfd.h"
 #include "elf-bfd.h"
-#include "elf/dwarf2.h"
+#include "dwarf2.h"
 
 /* The data in the .debug_line statement prologue looks like this.  */
 

diff --git a/bfd/elf-eh-frame.c b/bfd/elf-eh-frame.c
index 3567c24..2dbe63f 100644 (file)
--- a/bfd/elf-eh-frame.c
+++ b/bfd/elf-eh-frame.c
@@ -24,7 +24,7 @@
 #include "bfd.h"
 #include "libbfd.h"
 #include "elf-bfd.h"
-#include "elf/dwarf2.h"
+#include "dwarf2.h"
 
 #define EH_FRAME_HDR_SIZE 8
 

diff --git a/bfd/elf32-bfin.c b/bfd/elf32-bfin.c
index 647087a..a0947b6 100644 (file)
--- a/bfd/elf32-bfin.c
+++ b/bfd/elf32-bfin.c
@@ -23,7 +23,7 @@
 #include "libbfd.h"
 #include "elf-bfd.h"
 #include "elf/bfin.h"
-#include "elf/dwarf2.h"
+#include "dwarf2.h"
 #include "hashtab.h"
 
 /* FUNCTION : bfin_pltpc_reloc

diff --git a/bfd/elf32-frv.c b/bfd/elf32-frv.c
index fdf96a5..a0bee3a 100644 (file)
--- a/bfd/elf32-frv.c
+++ b/bfd/elf32-frv.c
@@ -24,7 +24,7 @@
 #include "libbfd.h"
 #include "elf-bfd.h"
 #include "elf/frv.h"
-#include "elf/dwarf2.h"
+#include "dwarf2.h"
 #include "hashtab.h"
 
 /* Forward declarations.  */

diff --git a/bfd/elf32-xc16x.c b/bfd/elf32-xc16x.c
index 8c06c7f..682035f 100644 (file)
--- a/bfd/elf32-xc16x.c
+++ b/bfd/elf32-xc16x.c
@@ -24,7 +24,7 @@
 #include "libbfd.h"
 #include "elf-bfd.h"
 #include "elf/xc16x.h"
-#include "elf/dwarf2.h"
+#include "dwarf2.h"
 #include "libiberty.h"
 
 static reloc_howto_type xc16x_elf_howto_table [] =

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6889538..dd0518a 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2009-07-10  Tom Tromey  <tromey@redhat.com>
+
+       * 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.
+
 2009-07-10  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
        Tidy up the code.

diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c
index ce13a5d..c620067 100644 (file)
--- a/gdb/dwarf2-frame.c
+++ b/gdb/dwarf2-frame.c
@@ -22,7 +22,7 @@
 
 #include "defs.h"
 #include "dwarf2expr.h"
-#include "elf/dwarf2.h"
+#include "dwarf2.h"
 #include "frame.h"
 #include "frame-base.h"
 #include "frame-unwind.h"

diff --git a/gdb/dwarf2expr.c b/gdb/dwarf2expr.c
index a9691bd..8dbf976 100644 (file)
--- a/gdb/dwarf2expr.c
+++ b/gdb/dwarf2expr.c
@@ -25,7 +25,7 @@
 #include "gdbtypes.h"
 #include "value.h"
 #include "gdbcore.h"
-#include "elf/dwarf2.h"
+#include "dwarf2.h"
 #include "dwarf2expr.h"
 #include "gdb_assert.h"
 

diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index 7a54f43..b163231 100644 (file)
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -33,7 +33,7 @@
 #include "exceptions.h"
 #include "block.h"
 
-#include "elf/dwarf2.h"
+#include "dwarf2.h"
 #include "dwarf2expr.h"
 #include "dwarf2loc.h"
 

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 7ed4253..8b485bd 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -31,7 +31,7 @@
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "objfiles.h"
-#include "elf/dwarf2.h"
+#include "dwarf2.h"
 #include "buildsym.h"
 #include "demangle.h"
 #include "expression.h"

diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c
index b80a871..df979dc 100644 (file)
--- a/gdb/sh-tdep.c
+++ b/gdb/sh-tdep.c
@@ -51,7 +51,7 @@
 
 /* sh flags */
 #include "elf/sh.h"
-#include "elf/dwarf2.h"
+#include "dwarf2.h"
 /* registers numbers shared with the simulator */
 #include "gdb/sim-sh.h"
 

diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
index ff683fa..966a739 100644 (file)
--- a/gdb/xtensa-tdep.c
+++ b/gdb/xtensa-tdep.c
@@ -35,7 +35,7 @@
 #include "regset.h"
 
 #include "dummy-frame.h"
-#include "elf/dwarf2.h"
+#include "dwarf2.h"
 #include "dwarf2-frame.h"
 #include "dwarf2loc.h"
 #include "frame.h"

diff --git a/include/ChangeLog b/include/ChangeLog
index 48c4008..74c0ead 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-10  Tom Tromey  <tromey@redhat.com>
+
+       * dwarf2.h: New file, moved from elf/.
+
 2009-07-09  Jakub Jelinek  <jakub@redhat.com>
 
        * dwarf2.h (enum dwarf_location_atom): Add DW_OP_implicit_value

diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index 6dec5fe..89235d1 100644 (file)
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-10  Tom Tromey  <tromey@redhat.com>
+
+       * dwarf2.h: Move to `..'.
+
 2009-07-10  H.J. Lu  <hongjiu.lu@intel.com>
 
        * dwarf2.h: Just include ../dwarf2.h.

diff --git a/include/elf/dwarf2.h b/include/elf/dwarf2.h
deleted file mode 100644 (file)
index 0203fc1..0000000
--- a/include/elf/dwarf2.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../dwarf2.h"