Merge branch 'master' into dwarf

Conflicts:
	libdw/ChangeLog
	src/readelf.c
	tests/ChangeLog
	tests/Makefile.am

diff --cc libdw/ChangeLog
index 704dc11657e98158e318c62aa14888a820621bc2,0b1746185696365370ee2b9fd869af0161db82cc..bc41702065a69a23a9f9f67192c1f07d444f9556
--- 1/libdw/ChangeLog
--- 2/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@@ -1,40 -1,37 +1,74 @@@
 +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,
+       DW_TAG_GNU_call_site_parameter,
+       DW_AT_GNU_call_site_value,
+       DW_AT_GNU_call_site_data_value,
+       DW_AT_GNU_call_site_target,
+       DW_AT_GNU_call_site_target_clobbered,
+       DW_AT_GNU_tail_call,
+       DW_AT_GNU_all_tail_call_sites,
+       DW_AT_GNU_all_call_sites,
+       DW_AT_GNU_all_source_call_sites,
+       and DW_OP_GNU_entry_value.
+ 
+ 2011-03-10  Petr Machata  <pmachata@redhat.com>
+ 
+       * libdw/dwarf_tag.c (__libdw_findabbrev): Reject requests for
+       abbreviation with code 0.
+ 
+ 2011-03-09  Petr Machata  <pmachata@redhat.com>
+ 
+       * libdw/dwarf_child.c (dwarf_child): Check for section overrun.
+ 
+ 2011-02-23  Roland McGrath  <roland@redhat.com>
+ 
+       * libdwP.h (struct Dwarf) [USE_ZLIB]: New member sectiondata_gzip_mask.
+       Declare __libdw_free_zdata.
+       * dwarf_end.c [USE_ZLIB] (__libdw_free_zdata): New function.
+       (dwarf_end): Call it.
+ 
+       * dwarf_begin_elf.c (valid_p): Likewise.
+       (check_section, scngrp_read): Likewise.
+       (check_section) [USE_ZLIB]: Grok .z* flavors of sections.
+ 
  2010-10-13  Roland McGrath  <roland@redhat.com>
  
        * dwarf.h: Add DW_LANG_Go.

diff --cc libdw/libdwP.h
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/readelf.c
Simple merge

diff --cc tests/ChangeLog
index 8a39c5bfef93bfd8a2f2332fe01733f0b31e07de,4ec3853c6c2a570bb6bda2036e15c1f8b6cc519e..0d7d15acda3653b5ea0f63da7b7784909d8e3c5f
--- 1/tests/ChangeLog
--- 2/tests/ChangeLog
+++ b/tests/ChangeLog
@@@ -1,7 -1,18 +1,22 @@@
 +2011-02-24  Roland McGrath  <roland@redhat.com>
 +
 +      * Makefile.am (TESTS): Put the slow dwarfcmp tests last.
 +
+ 2011-04-02  Marek Polacek  <mpolacek@redhat.com>
+ 
+       * dwarf-getstring.c: New test.
+       * run-dwarf-getstring.sh: And its wrapper.
+       * Makefile.am (EXTRA_DIST): Add and update all.
+ 
+ 2011-02-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
+ 
+       * Makefile.am (TESTS): Add run-readelf-twofiles.sh.
+       * run-readelf-twofiles.sh: New file.
+ 
+ 2011-02-25  Mark Wielaard  <mjw@redhat.com>
+ 
+       * Makefile.am (BUILD_RPATH): Be consistent in naming.
+ 
  2011-02-02  Josh Stone  <jistone@redhat.com>
  
        * run-prelink-addr-test.sh: Add testfile55, 32 and 64-bit.

diff --cc tests/Makefile.am
index 641bce2e6dc0d14a9e30f7b38c2dcb305ba71fee,32a15e28375357e62e8e2e5b7fad39e7f4779a98..d817644130b98b5d3f36be388ab8e702ab0cd826
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -59,9 -57,7 +59,9 @@@ 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-print dwarf_edit dwarf_edit_output \
+                 test-flag-nobits dwarf-getstring rerequest_tag
 +
  asm_TESTS = asm-tst1 asm-tst2 asm-tst3 asm-tst4 asm-tst5 \
            asm-tst6 asm-tst7 asm-tst8 asm-tst9
  
@@@ -87,11 -83,8 +87,12 @@@ TESTS = run-arextract.sh run-arsymtest.
        run-dwfl-bug-offline-rel.sh run-dwfl-addr-sect.sh \
        run-disasm-x86.sh run-disasm-x86-64.sh \
        run-early-offscn.sh run-dwarf-getmacros.sh \
 +      run-dwarf-attributes.sh \
 +      run-dwarf_edit.sh dwarf_edit_output \
        run-test-flag-nobits.sh run-prelink-addr-test.sh \
 -      run-dwarf-getstring.sh run-rerequest_tag.sh
++      run-dwarf-getstring.sh run-rerequest_tag.sh \
 +      run-dwarflint-self.sh \
 +      run-dwarfcmp-self.sh run-dwarfcmp-test-self.sh
  # run-show-ciefde.sh
  
  if !STANDALONE
@@@ -125,8 -118,7 +126,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-dwarfcmp-self.sh run-dwarfcmp-test-self.sh \
 +           run-dwarflint-self.sh run-dwarf-attributes.sh run-dwarf_edit.sh \
+            run-dwarf-getstring.sh \
             testfile15.bz2 testfile15.debug.bz2 \
             testfile16.bz2 testfile16.debug.bz2 \
             testfile17.bz2 testfile17.debug.bz2 \