Merge branch 'master' into roland/relocate

diff --cc libdw/ChangeLog
index 986427795ee3f0abdd2ac4e9599b0ce33ab8a18a,5d274cb552e9d1a77e7682a616369c62fa946977..2fdc8bd90336fbad9e708be8cdf31f3ef960ba37
--- 1/libdw/ChangeLog
--- 2/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@@ -1,48 -1,17 +1,60 @@@
+ 2010-06-22  Roland McGrath  <roland@redhat.com>
+ 
+       * dwarf_getsrclines.c: Fix signed comparison warning in extended
+       opcode parsing.
+ 
+ 2010-06-21  Roland McGrath  <roland@redhat.com>
+ 
+       * dwarf.h: Add DW_TAG_GNU_* constants.
+ 
+       * memory-access.h (get_sleb128_rest_return): Fix sign extension for
+       10-byte case.
+ 
 +2010-06-21  Roland McGrath  <roland@redhat.com>
 +
 +      * relocate.c (__libdw_relocatable): New function.
 +      * libdwP.h: Declare it.
 +      * dwarf_form_relocatable.c: New file.
 +      * dwarf_lineaddr_relocatable.c: New file.
 +      * Makefile.am (libdw_a_SOURCES): Add them.
 +      * libdw.map (ELFUTILS_0.149): New set; add those.
 +      * libdw.h: Declare them.
 +
 +      * libdwP.h (struct Dwarf_Line_s): Replace files with cu.
 +      (struct Dwarf_Lines_s): New member reloc.
 +      * dwarf_linesrc.c: Update usage.
 +      * dwarf_getsrc_file.c: Likewise.
 +      * dwarf_getsrclines.c: Record relocatable address locations in
 +      parallel array, with Dwarf_Line.addr becoming a relative offset.
 +      * dwarf_lineaddr.c: Use __libdw_read_address on demand for a
 +      relocatable line address.
 +
  2010-06-20  Roland McGrath  <roland@redhat.com>
  
 +      * relocate.c: New file.
 +      * Makefile.am (libdw_a_SOURCES): Add it.
 +      * libdwP.h (struct dwarf_file_reloc): New type.
 +      (struct Dwarf): New member relocate.
 +      (__libdw_relocate_address, __libdw_relocate_offset): Replace inlines
 +      with extern decls.
 +      (READ_AND_RELOCATE): Call RELOC_HOOK if DBG->relocate,
 +      else read directly.
 +      (__libdw_read_address, __libdw_read_offset): Just call *_inc variant.
 +      (__libdw_relocate_begin, __libdw_relocate_end): Declare them.
 +      * dwarf_begin_elf.c (check_section): Take new args to track reloc
 +      sections.
 +      (global_read, scngrp_read): Pass new args through to check_section.
 +      (dwarf_begin_elf): Track reloc sections in an ET_REL file,
 +      call __libdw_relocate_begin.
 +
 +      * libdwP.h (DWARF_E_RELOC, DWARF_E_RELBADTYPE): New enum constants.
 +      (DWARF_E_RELBADADDEND, DWARF_E_RELBADOFF): Likewise.
 +      (DWARF_E_RELBADSYM, DWARF_E_RELUNDEF, DWARF_E_RELWRONGSEC): Likewise.
 +      * dwarf_error.c (errmsgs): Add them.
 +
 +      * cfi.h (BYTE_ORDER_DUMMY): Macro moved ...
 +      * memory-access.h: ... here.
 +
        * libdw_findcu.c (__libdw_findcu): Take new flag argument,
        to search TUs instead of CUs.
        * libdwP.h: Update decl.

diff --cc libdw/dwarf_getsrclines.c
Simple merge

diff --cc libdw/memory-access.h
Simple merge