Merge branch 'master' into dwarf

Conflicts:
	tests/Makefile.am: New tests merged.

diff --cc libdw/ChangeLog
index bc41702065a69a23a9f9f67192c1f07d444f9556,8febd4287ffe7cda82af67f6f10cce1345930a13..e2fcb6e15a66d76c7ec0451f73a5c00f302ce01f
--- 1/libdw/ChangeLog
--- 2/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@@ -1,40 -1,8 +1,45 @@@
+ 2011-04-26  Mark Wielaard  <mjw@redhat.com>
+ 
+       * dwarf_child (dwarf_child): Sanity check end of section against
+       cu_data () of die->cu.
+ 
 +2011-02-24  Roland McGrath  <roland@redhat.com>
 +
 +      * libdw.map (ELFUTILS_PRIVATE_TMP): New version set;
 +      add __libdw_formptr.
 +
 +      * libdwP.h: Make declarations C++-compatible using __BEGIN_DECLS.
 +
 +2011-02-23  Roland McGrath  <roland@redhat.com>
 +
 +      * c++/dwarf-knowledge.cc (expected_value_space):
 +      Grok DW_AT_GNU_odr_signature.
 +
 +2010-12-07  Petr Machata  <pmachata@redhat.com>
 +
 +      * c++/subr.hh (sharing_stack::element::pop): Remove.  Move the
 +      logic to sharing_stack::pop.
 +      * c++/dwarf (debug_info_entry::children_type::const_iterator): Use
 +      sharing_stack instead of stackish.
 +      * c++/dwarf_tracker (dwarf_path_finder): Likewise.
 +
 +2010-11-30  Roland McGrath  <roland@redhat.com>
 +
 +      * c++/dwarf (dwarf::directory_table): Remove class.
 +      (dwarf::compile_unit::include_directories): Remove method.
 +      (dwarf::line_info_table::include_directories): Remove method.
 +      (dwarf::line_info_table::operator==): Don't use it.
 +      * c++/dwarf_data (dwarf_data::directory_table): Remove class.
 +      (dwarf_data::compile_unit::include_directories): Remove method.
 +      (dwarf_data::line_info_table::include_directories): Remove method.
 +      (dwarf_data::line_info_table::hasher): Replace.
 +      (dwarf_data::line_info_table::operator==): Don't use it.
 +      * c++/dwarf_output (dwarf_output::directory_table): Remove class.
 +      * c++/values.cc (line_info_string): Ignore include_directories.
 +      (dwarf::directory_table): Remove methods.
 +      * c++/line_info.cc (dwarf::directory_table): Remove methods.
 +      * c++/edit-values.cc (dwarf_data::line_table): Update instantiation.
 +
  2011-03-22  Mark Wielaard  <mjw@redhat.com>
  
        * dwarf.h: Add DW_TAG_GNU_call_site,

diff --cc src/ChangeLog
Simple merge

diff --cc src/readelf.c
Simple merge

diff --cc tests/ChangeLog
index 0d7d15acda3653b5ea0f63da7b7784909d8e3c5f,674fe969b63b84bd3d0c9a0784f7b2d9bd1e12bb..271096a53f759e4c6710b6fdb65dfd37caed9761
--- 1/tests/ChangeLog
--- 2/tests/ChangeLog
+++ b/tests/ChangeLog
@@@ -1,8 -1,11 +1,15 @@@
- 2011-04-02  Marek Polacek  <mpolacek@redhat.com>
+ 2011-03-28  Marek Polacek  <mpolacek@redhat.com>
+ 
+       * alldts.c: New file.
+       * run-alldts.sh: Use it.
+       * Makefile.am (TESTS, EXTRA_DIST, noinst_PROGRAMS): Add them.
+       (alldts_LDADD): New variable.
+ 
 +2011-02-24  Roland McGrath  <roland@redhat.com>
 +
 +      * Makefile.am (TESTS): Put the slow dwarfcmp tests last.
 +
+ 2011-03-02  Marek Polacek  <mpolacek@redhat.com>
  
        * dwarf-getstring.c: New test.
        * run-dwarf-getstring.sh: And its wrapper.

diff --cc tests/Makefile.am
index d817644130b98b5d3f36be388ab8e702ab0cd826,35f55e3c139cca9c3ae02fb89ae306540ef76979..b60e4cc93a8d54f87e9b609706241bd46f55e473
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -59,9 -57,8 +59,10 @@@ noinst_PROGRAMS = arextract arsymtest n
                  dwfl-bug-addr-overflow arls dwfl-bug-fd-leak \
                  dwfl-addr-sect dwfl-bug-report early-offscn \
                  dwfl-bug-getmodules dwarf-getmacros addrcfi \
-                 test-flag-nobits dwarf-getstring rerequest_tag
 +                dwarf-print dwarf_edit dwarf_edit_output \
+                 test-flag-nobits dwarf-getstring rerequest_tag \
+                 alldts
 +
  asm_TESTS = asm-tst1 asm-tst2 asm-tst3 asm-tst4 asm-tst5 \
            asm-tst6 asm-tst7 asm-tst8 asm-tst9
  
@@@ -126,9 -119,7 +127,9 @@@ EXTRA_DIST = run-arextract.sh run-arsym
             run-addrname-test.sh run-dwfl-bug-offline-rel.sh \
             run-dwfl-addr-sect.sh run-early-offscn.sh \
             run-dwarf-getmacros.sh run-test-flag-nobits.sh \
-            run-dwarf-getstring.sh \
 +           run-dwarfcmp-self.sh run-dwarfcmp-test-self.sh \
 +           run-dwarflint-self.sh run-dwarf-attributes.sh run-dwarf_edit.sh \
+            run-dwarf-getstring.sh run-alldts.sh \
             testfile15.bz2 testfile15.debug.bz2 \
             testfile16.bz2 testfile16.debug.bz2 \
             testfile17.bz2 testfile17.debug.bz2 \