Merge commit 'origin/master' into dwarf

Conflicts:
	libdw/ChangeLog

diff --cc libdw/ChangeLog
index 6f2f47fef0e0da58cbf64911563ab609d9f888f9,6ae3154ac0dd6b24f1f816f3d20b36568f3bb60d..97ff01fa0b56ecdb7c8a61e4cdc9f344ed1e5a6c
--- 1/libdw/ChangeLog
--- 2/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@@ -1,60 -1,12 +1,69 @@@
 +2009-04-02  Roland McGrath  <roland@redhat.com>
 +
 +      * Makefile.am (noinst_HEADERS): Add known-dwarf.h and
 +      c++/dwarf-knowledge.cc here.
 +
 +2009-03-29  Roland McGrath  <roland@redhat.com>
 +
 +      * c++/exception.cc: New file.
 +      * Makefile.am (libdwpp_a_SOURCES): Add it.
 +
 +2009-03-25  Roland McGrath  <roland@redhat.com>
 +
 +      * c++/dwarf, c++/values.cc: Proper dwarf_constant support.
 +      * c++/dwarf_edit, c++/edit-values.cc: Likewise.
 +      * c++/known.cc: New file.
 +      * Makefile.am (libdwpp_a_SOURCES): Add it.
 +
 +2009-03-24  Petr Machata  <pmachata@redhat.com>
 +
 +      * c++/dwarf (dwarf::debug_info_entry::raw_attributes):
 +      Fix iteration over attributes.
 +
 +2009-03-24  Roland McGrath  <roland@redhat.com>
 +
 +      * Makefile.am (libdwpp_a_SOURCES): New variable.
 +      (lib_LIBRARIES): Add libdwpp.a to it.
 +
 +2009-02-26  Roland McGrath  <roland@redhat.com>
 +
 +      * c++/dwarf (dwarf::attr_value): Add _m_tag private member.
 +      (dwarf::attr_value, dwarf::attribute): Update initializers.
 +      (dwarf::raw_attributes::const_iterator): Update caller.
 +      * c++/values.cc (attr_value::what_space): Use it.
 +
 +2009-02-01  Roland McGrath  <roland@redhat.com>
 +
 +      * c++/edit-values.cc: New file.
 +
 +2009-01-28  Roland McGrath  <roland@redhat.com>
 +
 +      * c++/dwarf: Add line table support.
 +      * c++/values.cc: New file.
 +      * c++/line_info.cc: New file.
 +      * c++/subr.hh: New file.
 +      * Makefile.am (pkginclude_HEADERS): Add it.
 +
 +2009-01-26  Roland McGrath  <roland@redhat.com>
 +
 +      * c++/dwarf (dwarf_output): Renamed to dwarf_edit and moved to ...
 +      * c++/dwarf_edit: ... here.  New file.
 +      * Makefile.am (pkginclude_HEADERS): Add it.
 +
 +2009-01-10  Roland McGrath  <roland@redhat.com>
 +
 +      * c++/dwarf: New file.
 +      * Makefile.am (pkginclude_HEADERS): Add it.
 +
+ 2009-06-18  Roland McGrath  <roland@redhat.com>
+ 
+       * libdwP.h (__libdw_read_address_inc): Constify.
+       (__libdw_read_offset_inc): Likewise.
+       * dwarf_getaranges.c: Likewise.
+       * dwarf_getlocation.c: Likewise.
+       * dwarf_getsrclines.c: Likewise.
+       * dwarf_nextcu.c: Likewise.
+ 
  2009-05-05  Petr Machata  <pmachata@redhat.com>
  
        * libdwP.h (__libdw_formptr): Declare new function.

diff --cc libdw/libdwP.h
Simple merge