summaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
Diffstat (limited to 'binutils')
-rw-r--r--binutils/ChangeLog6
-rw-r--r--binutils/Makefile.am2
-rw-r--r--binutils/Makefile.in2
-rw-r--r--binutils/dwarf.c2
4 files changed, 9 insertions, 3 deletions
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 <tromey@redhat.com>
+
+ * 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 <gingold@adacore.com>
* 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;