Merge branch 'master' of ssh://git.fedorahosted.org/git/elfutils into roland/unwind

Conflicts:
	tests/ChangeLog

diff --cc libdwfl/ChangeLog
index 9115b29917b43c7b7c98a020bc5e7aa641c588b1,8f51ca73c3eacd68e1ba5c2605b8fb87e0aa1749..c73b76865c2b7a604e9a4556c9c40abe44a0c154
--- 1/libdwfl/ChangeLog
--- 2/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@@ -1,12 -1,29 +1,38 @@@
+ 2009-04-23  Ulrich Drepper  <drepper@redhat.com>
+ 
+       * dwfl_module_build_id.c: Define versioned symbols only if SHARED is
+       defined.  Otherwise just define the latest version.
+ 
+ 2009-04-22  Roland McGrath  <roland@redhat.com>
+ 
+       * relocate.c (resolve_symbol): Apply correct bias to st_value found in
+       a non-ET_REL module.
+ 
+       * dwfl_module_build_id.c (__libdwfl_find_build_id): Fix last change to
+       adjust properly for non-ET_REL.
+ 
+ 2009-04-21  Roland McGrath  <roland@redhat.com>
+ 
+       * dwfl_module_getsym.c: Apply non-ET_REL bias only if SHF_ALLOC.
+ 
+       * relocate.c (__libdwfl_relocate_value): Assert that MOD is ET_REL.
+       * derelocate.c (cache_sections): Call __libdwfl_relocate_value only
+       for ET_REL.
+       * dwfl_module_build_id.c (__libdwfl_find_build_id): Likewise.
+ 
+ 2009-04-20  Roland McGrath  <roland@redhat.com>
+ 
+       * dwfl_module_getdwarf.c (__libdwfl_getelf): Add internal_function.
+ 
 +2009-04-19  Roland McGrath  <roland@redhat.com>
 +
 +      * dwfl_module_dwarf_cfi.c: New file.
 +      * dwfl_module_eh_cfi.c: New file.
 +      * dwfl_addrframe.c: New file.
 +      * Makefile.am (libdwfl_a_SOURCES): Add them.
 +      * libdwflP.h (struct Dwfl_Module): New members `dwarf_cfi', `eh_cfi.
 +      Add INTDECL for dwfl_module_eh_cfi, dwfl_module_dwarf_cfi.
 +
  2009-04-19  Roland McGrath  <roland@redhat.com>
  
        * dwfl_module_getdwarf.c (find_file): Renamed to ...

diff --cc tests/ChangeLog
index 151dcabf3a44dc6f5dbdfa243ba14c44274aeaef,f1fd512b37a454d7296a55e8447a192ee346c2ad..e8bb53ae49ebd17000670ff60c8e5286534030a4
--- 1/tests/ChangeLog
--- 2/tests/ChangeLog
+++ b/tests/ChangeLog
@@@ -1,9 -1,14 +1,20 @@@
 -      
 +2009-04-19  Roland McGrath  <roland@redhat.com>
 +
 +      * addrcfi.c: New file.
 +      * Makefile.am (noinst_PROGRAMS): Add it.
 +      (addrcfi_LDADD): New variable.
 +
+ 2009-04-23  Ulrich Drepper  <drepper@redhat.com>
+ 
+       * Makefile [BUILD_STATIC] (libdw): Add $(zip_LIBS).
+       (rdwrmmap_LDADD): Add $(libmudflap).
++
+ 2009-04-21  Roland McGrath  <roland@redhat.com>
+ 
+       * testfile50.bz2: New data file.
+       * Makefile.am (EXTRA_DIST): Add it.
+       * run-dwfl-addr-sect.sh: Add a case using it.
+ 
  2008-12-31  Ulrich Drepper  <drepper@redhat.com>
  
        * testfile44.S.bz2: Add tests for dppd, dpps, insertps, movntdqa,

diff --cc tests/Makefile.am
Simple merge