From a80b05740893248fee5750aa1cad4b5b64f46219 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 9 Jul 2009 19:41:25 +0000 Subject: [PATCH] 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 --- gcc/ChangeLog | 16 ++++++++++++++++ gcc/Makefile.in | 2 +- gcc/ada/ChangeLog | 4 ++++ gcc/ada/raise-gcc.c | 4 ---- gcc/config/i386/i386.c | 2 +- gcc/config/mmix/mmix.c | 2 +- gcc/config/rs6000/darwin-fallback.c | 2 +- gcc/config/sh/sh.c | 2 +- gcc/config/xtensa/unwind-dw2-xtensa.c | 2 +- gcc/dwarf2asm.c | 4 ++-- gcc/dwarf2out.c | 2 +- gcc/except.c | 2 +- gcc/unwind-dw2-fde-darwin.c | 2 +- gcc/unwind-dw2-fde-glibc.c | 2 +- gcc/unwind-dw2-fde.c | 2 +- gcc/unwind-dw2.c | 2 +- include/ChangeLog | 5 +++++ include/{elf => }/dwarf2.h | 0 18 files changed, 39 insertions(+), 18 deletions(-) rename include/{elf => }/dwarf2.h (100%) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 01dff9e73c6..e0c4c31b77f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,19 @@ +2009-07-09 Tom Tromey + + * 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 * haifa-sched.c (insn_finishes_cycle_p): New static function. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 6a9c2fe4b91..9cdf6a2d063 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 b3eef9e2469..784ef67cb87 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,7 @@ +2009-07-09 Tom Tromey + + * raise-gcc.c: Include dwarf2h (unconditionally). + 2009-07-09 Ed Schonberg * 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 ca20709ddc8..1d9efb93b7f 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 15a73d86551..6bc23fc7571 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 f81512401f6..67b1b2323b5 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 e4d5afe50ac..4591071ea74 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 diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c index 18123c34cde..b4c190029df 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 235b8a12563..e7ca86a10fb 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 4e2c9980feb..c12f809d7ed 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 2e30a0c6702..fce8b92e346 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 4a02fe305b4..95163cc356b 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 c033bbe0cb5..cd00ea22f4c 100644 --- a/gcc/unwind-dw2-fde-darwin.c +++ b/gcc/unwind-dw2-fde-darwin.c @@ -27,7 +27,7 @@ #include "tsystem.h" #include #include -#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 8f6473dbaab..418f0300108 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 6780700e6af..4aa9d82af8d 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 0ceda12a44b..68a1a282b34 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 diff --git a/include/ChangeLog b/include/ChangeLog index 148e404957a..ccd927421f5 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2009-07-09 Tom Tromey + + * elf/dwarf2.h: Remove, renaming to... + * dwarf2.h: ... this. + 2009-06-29 Tom Tromey * elf/dwarf2.h: New file. Merged with gdb. diff --git a/include/elf/dwarf2.h b/include/dwarf2.h similarity index 100% rename from include/elf/dwarf2.h rename to include/dwarf2.h -- 2.11.4.GIT