From f787830b5e6da3bfa33914c10cf3e4de49554e71 Mon Sep 17 00:00:00 2001 From: Tom Tromey 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 `..'. --- gas/Makefile.am | 56 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'gas/Makefile.am') diff --git a/gas/Makefile.am b/gas/Makefile.am index 8e8c8cc02b..56cd4a6b93 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 \ -- cgit v1.2.1