unwind-dw2-fde-darwin.c: Include dwarf2.h.

gcc
	* unwind-dw2-fde-darwin.c: Include dwarf2.h.
	* config/mmix/mmix.c: Include dwarf2.h.
	* config/rs6000/darwin-fallback.c: Include dwarf2.h.
	* config/xtensa/unwind-dw2-xtensa.c: Include dwarf2.h.
	* config/sh/sh.c: Include dwarf2.h.
	* config/i386/i386.c: Include dwarf2.h.
	* Makefile.in (DWARF2_H): Remove 'elf'.
	* except.c: Include dwarf2.h.
	* unwind-dw2.c: Include dwarf2.h.
	* dwarf2out.c: Include dwarf2.h.
	* unwind-dw2-fde-glibc.c: Include dwarf2.h.
	* unwind-dw2-fde.c: Include dwarf2.h.
	* dwarf2asm.c: Include dwarf2.h.
gcc/ada
	* raise-gcc.c: Include dwarf2h (unconditionally).
include
	* elf/dwarf2.h: Remove, renaming to...
	* dwarf2.h: ... this.

From-SVN: r149433

16 files changed, 34 insertions, 18 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 01dff9e..e0c4c31 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,19 @@
+2009-07-09  Tom Tromey  <tromey@redhat.com>
+
+	* unwind-dw2-fde-darwin.c: Include dwarf2.h.
+	* config/mmix/mmix.c: Include dwarf2.h.
+	* config/rs6000/darwin-fallback.c: Include dwarf2.h.
+	* config/xtensa/unwind-dw2-xtensa.c: Include dwarf2.h.
+	* config/sh/sh.c: Include dwarf2.h.
+	* config/i386/i386.c: Include dwarf2.h.
+	* Makefile.in (DWARF2_H): Remove 'elf'.
+	* except.c: Include dwarf2.h.
+	* unwind-dw2.c: Include dwarf2.h.
+	* dwarf2out.c: Include dwarf2.h.
+	* unwind-dw2-fde-glibc.c: Include dwarf2.h.
+	* unwind-dw2-fde.c: Include dwarf2.h.
+	* dwarf2asm.c: Include dwarf2.h.
+
 2009-07-09  Maxim Kuvyrkov  <maxim@codesourcery.com>
         
 	* haifa-sched.c (insn_finishes_cycle_p): New static function.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 6a9c2fe..9cdf6a2 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -405,7 +405,7 @@ SPLAY_TREE_H= $(srcdir)/../include/splay-tree.h
 FIBHEAP_H   = $(srcdir)/../include/fibheap.h
 PARTITION_H = $(srcdir)/../include/partition.h
 MD5_H	    = $(srcdir)/../include/md5.h
-DWARF2_H    = $(srcdir)/../include/elf/dwarf2.h
+DWARF2_H    = $(srcdir)/../include/dwarf2.h
 
 # Default native SYSTEM_HEADER_DIR, to be overridden by targets.
 NATIVE_SYSTEM_HEADER_DIR = /usr/include
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index b3eef9e..784ef67 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-09  Tom Tromey  <tromey@redhat.com>
+
+	* raise-gcc.c: Include dwarf2h (unconditionally).
+
 2009-07-09  Ed Schonberg  <schonberg@adacore.com>
 
 	* sem_ch10.adb (Install_Context): If the unit is a package body,
diff --git a/gcc/ada/raise-gcc.c b/gcc/ada/raise-gcc.c
index ca20709..1d9efb93b 100644
--- a/gcc/ada/raise-gcc.c
+++ b/gcc/ada/raise-gcc.c
@@ -96,11 +96,7 @@ __gnat_Unwind_ForcedUnwind (_Unwind_Exception *, void *, void *);
 
 #ifdef IN_RTS   /* For eh personality routine */
 
-#if (__GNUC__ * 10 + __GNUC_MINOR__ > 44)
-#include "elf/dwarf2.h"
-#else
 #include "dwarf2.h"
-#endif
 #include "unwind-dw2-fde.h"
 #include "unwind-pe.h"
 
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 15a73d8..6bc23fc 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -48,7 +48,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "langhooks.h"
 #include "cgraph.h"
 #include "gimple.h"
-#include "elf/dwarf2.h"
+#include "dwarf2.h"
 #include "df.h"
 #include "tm-constrs.h"
 #include "params.h"
diff --git a/gcc/config/mmix/mmix.c b/gcc/config/mmix/mmix.c
index f815124..67b1b23 100644
--- a/gcc/config/mmix/mmix.c
+++ b/gcc/config/mmix/mmix.c
@@ -36,7 +36,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "toplev.h"
 #include "recog.h"
 #include "ggc.h"
-#include "elf/dwarf2.h"
+#include "dwarf2.h"
 #include "debug.h"
 #include "tm_p.h"
 #include "integrate.h"
diff --git a/gcc/config/rs6000/darwin-fallback.c b/gcc/config/rs6000/darwin-fallback.c
index e4d5afe..4591071 100644
--- a/gcc/config/rs6000/darwin-fallback.c
+++ b/gcc/config/rs6000/darwin-fallback.c
@@ -28,7 +28,7 @@
 #include "tsystem.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "elf/dwarf2.h"
+#include "dwarf2.h"
 #include "unwind.h"
 #include "unwind-dw2.h"
 #include <stdint.h>
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index 18123c3..b4c1900 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -38,7 +38,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "toplev.h"
 #include "recog.h"
 #include "integrate.h"
-#include "elf/dwarf2.h"
+#include "dwarf2.h"
 #include "tm_p.h"
 #include "target.h"
 #include "target-def.h"
diff --git a/gcc/config/xtensa/unwind-dw2-xtensa.c b/gcc/config/xtensa/unwind-dw2-xtensa.c
index 235b8a1..e7ca86a 100644
--- a/gcc/config/xtensa/unwind-dw2-xtensa.c
+++ b/gcc/config/xtensa/unwind-dw2-xtensa.c
@@ -28,7 +28,7 @@
 #include "tsystem.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "elf/dwarf2.h"
+#include "dwarf2.h"
 #include "unwind.h"
 #ifdef __USING_SJLJ_EXCEPTIONS__
 # define NO_SIZE_OF_ENCODED_VALUE
diff --git a/gcc/dwarf2asm.c b/gcc/dwarf2asm.c
index 4e2c998..c12f809 100644
--- a/gcc/dwarf2asm.c
+++ b/gcc/dwarf2asm.c
@@ -1,5 +1,5 @@
 /* Dwarf2 assembler output helper routines.
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -29,7 +29,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "output.h"
 #include "target.h"
 #include "dwarf2asm.h"
-#include "elf/dwarf2.h"
+#include "dwarf2.h"
 #include "splay-tree.h"
 #include "ggc.h"
 #include "tm_p.h"
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 2e30a0c..fce8b92 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -74,7 +74,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "expr.h"
 #include "libfuncs.h"
 #include "except.h"
-#include "elf/dwarf2.h"
+#include "dwarf2.h"
 #include "dwarf2out.h"
 #include "dwarf2asm.h"
 #include "toplev.h"
diff --git a/gcc/except.c b/gcc/except.c
index 4a02fe3..95163cc 100644
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -65,7 +65,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "output.h"
 #include "dwarf2asm.h"
 #include "dwarf2out.h"
-#include "elf/dwarf2.h"
+#include "dwarf2.h"
 #include "toplev.h"
 #include "hashtab.h"
 #include "intl.h"
diff --git a/gcc/unwind-dw2-fde-darwin.c b/gcc/unwind-dw2-fde-darwin.c
index c033bbe..cd00ea2 100644
--- a/gcc/unwind-dw2-fde-darwin.c
+++ b/gcc/unwind-dw2-fde-darwin.c
@@ -27,7 +27,7 @@
 #include "tsystem.h"
 #include <string.h>
 #include <stdlib.h>
-#include "elf/dwarf2.h"
+#include "dwarf2.h"
 #include "unwind.h"
 #define NO_BASE_OF_ENCODED_VALUE
 #define DWARF2_OBJECT_END_PTR_EXTENSION
diff --git a/gcc/unwind-dw2-fde-glibc.c b/gcc/unwind-dw2-fde-glibc.c
index 8f6473db..418f030 100644
--- a/gcc/unwind-dw2-fde-glibc.c
+++ b/gcc/unwind-dw2-fde-glibc.c
@@ -37,7 +37,7 @@
 #endif
 #include "coretypes.h"
 #include "tm.h"
-#include "elf/dwarf2.h"
+#include "dwarf2.h"
 #include "unwind.h"
 #define NO_BASE_OF_ENCODED_VALUE
 #include "unwind-pe.h"
diff --git a/gcc/unwind-dw2-fde.c b/gcc/unwind-dw2-fde.c
index 6780700..4aa9d82 100644
--- a/gcc/unwind-dw2-fde.c
+++ b/gcc/unwind-dw2-fde.c
@@ -29,7 +29,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #include "tsystem.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "elf/dwarf2.h"
+#include "dwarf2.h"
 #include "unwind.h"
 #define NO_BASE_OF_ENCODED_VALUE
 #include "unwind-pe.h"
diff --git a/gcc/unwind-dw2.c b/gcc/unwind-dw2.c
index 0ceda12..68a1a28 100644
--- a/gcc/unwind-dw2.c
+++ b/gcc/unwind-dw2.c
@@ -27,7 +27,7 @@
 #include "tsystem.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "elf/dwarf2.h"
+#include "dwarf2.h"
 #include "unwind.h"
 #ifdef __USING_SJLJ_EXCEPTIONS__
 # define NO_SIZE_OF_ENCODED_VALUE