From fa8f86ff3b8e5b29e3b217abeaa33a747052c43e Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 10 Jul 2009 15:27:04 +0000
Subject: 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 `..'.
---
 gdb/ChangeLog      | 9 +++++++++
 gdb/dwarf2-frame.c | 2 +-
 gdb/dwarf2expr.c   | 2 +-
 gdb/dwarf2loc.c    | 2 +-
 gdb/dwarf2read.c   | 2 +-
 gdb/sh-tdep.c      | 2 +-
 gdb/xtensa-tdep.c  | 2 +-
 7 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'gdb')

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6889538..dd0518a 100644
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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"
-- 
cgit v1.1