From fa8f86ff3b8e5b29e3b217abeaa33a747052c43e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 10 Jul 2009 15:27:04 +0000 Subject: [PATCH] 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 `..'. --- bfd/ChangeLog | 14 +++++++++++ bfd/Makefile.am | 10 ++++---- bfd/Makefile.in | 10 ++++---- bfd/dwarf2.c | 2 +- bfd/elf-eh-frame.c | 2 +- bfd/elf32-bfin.c | 2 +- bfd/elf32-frv.c | 2 +- bfd/elf32-xc16x.c | 2 +- binutils/ChangeLog | 6 +++++ binutils/Makefile.am | 2 +- binutils/Makefile.in | 2 +- binutils/dwarf.c | 2 +- gas/ChangeLog | 36 ++++++++++++++++++++++++++++ gas/Makefile.am | 56 +++++++++++++++++++++---------------------- gas/Makefile.in | 56 +++++++++++++++++++++---------------------- gas/dw2gencfi.h | 2 +- gas/dwarf2dbg.c | 2 +- gas/ehopt.c | 2 +- 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 +- include/ChangeLog | 4 ++++ include/elf/ChangeLog | 4 ++++ include/elf/dwarf2.h | 1 - 28 files changed, 156 insertions(+), 84 deletions(-) delete mode 100644 include/elf/dwarf2.h diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 2fed91d6675..3e958a994bb 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,17 @@ +2009-07-10 Tom Tromey + + * 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 * elf32-arm.c (arm_build_one_stub): Use the hash entry of the diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 13da4ef5d8f..d487d85eb4e 100644 --- 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 45e184ace8a..d01added592 100644 --- 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 e88a6afc0b9..3085180e270 100644 --- 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 3567c240684..2dbe63f4a06 100644 --- 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 647087a9a87..a0947b61107 100644 --- 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 fdf96a5bfc6..a0bee3ade31 100644 --- 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 8c06c7f2cea..682035fcb45 100644 --- 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/binutils/ChangeLog b/binutils/ChangeLog index 36e8dd9d609..cca503182f1 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,9 @@ +2009-07-10 Tom Tromey + + * Makefile.am (dwarf.o): Refer to dwarf2.h, not elf/dwarf2.h. + * Makefile.in: Rebuild. + * dwarf.c: Include dwarf2.h, not elf/dwarf2.h. + 2009-07-06 Tristan Gingold * objdump.c (dump_dwarf_section): Handle .eh_frame like other dwarf diff --git a/binutils/Makefile.am b/binutils/Makefile.am index d3dd46eb8bf..8b48f6fc72b 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -623,7 +623,7 @@ dwarf.o: \ $(INCDIR)/ansidecl.h \ $(INCDIR)/binary-io.h \ $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/dwarf2.h \ + $(INCDIR)/dwarf2.h \ $(INCDIR)/fopen-same.h \ $(INCDIR)/libiberty.h \ $(INCDIR)/symcat.h \ diff --git a/binutils/Makefile.in b/binutils/Makefile.in index d001448349d..62e821f0647 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -1391,7 +1391,7 @@ dwarf.o: \ $(INCDIR)/ansidecl.h \ $(INCDIR)/binary-io.h \ $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/dwarf2.h \ + $(INCDIR)/dwarf2.h \ $(INCDIR)/fopen-same.h \ $(INCDIR)/libiberty.h \ $(INCDIR)/symcat.h \ diff --git a/binutils/dwarf.c b/binutils/dwarf.c index dc0fedc4ac7..78f98840d4d 100644 --- a/binutils/dwarf.c +++ b/binutils/dwarf.c @@ -24,7 +24,7 @@ #include "bfd.h" #include "bucomm.h" #include "elf/common.h" -#include "elf/dwarf2.h" +#include "dwarf2.h" #include "dwarf.h" static int have_frame_base; diff --git a/gas/ChangeLog b/gas/ChangeLog index 29688d8d58e..85e66cb3457 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,39 @@ +2009-07-10 Tom Tromey + + * 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 * config/tc-arm.c (it_fsm_post_encode): New forward declaration. diff --git a/gas/Makefile.am b/gas/Makefile.am index 8e8c8cc02ba..56cd4a6b938 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 6e314d92aff..032440d4cca 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 307fbb73fea..9f9569c4d30 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 66d6b6e995f..de56095981b 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 b3789d84173..ece0f2b74c0 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. diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 68895386493..dd0518a8500 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2009-07-10 Tom Tromey + + * 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 Tidy up the code. diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c index ce13a5d4448..c620067fddc 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 a9691bdb4a2..8dbf97694b6 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 7a54f436ab5..b16323153e3 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 7ed425397b7..8b485bd7662 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 b80a87126f6..df979dc1bcc 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 ff683faaf0e..966a739ea4d 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" diff --git a/include/ChangeLog b/include/ChangeLog index 48c40083460..74c0ead4bcb 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2009-07-10 Tom Tromey + + * dwarf2.h: New file, moved from elf/. + 2009-07-09 Jakub Jelinek * dwarf2.h (enum dwarf_location_atom): Add DW_OP_implicit_value diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog index 6dec5feba06..89235d1a98f 100644 --- a/include/elf/ChangeLog +++ b/include/elf/ChangeLog @@ -1,3 +1,7 @@ +2009-07-10 Tom Tromey + + * dwarf2.h: Move to `..'. + 2009-07-10 H.J. Lu * dwarf2.h: Just include ../dwarf2.h. diff --git a/include/elf/dwarf2.h b/include/elf/dwarf2.h deleted file mode 100644 index 0203fc1e7be..00000000000 --- a/include/elf/dwarf2.h +++ /dev/null @@ -1 +0,0 @@ -#include "../dwarf2.h" -- 2.30.2