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

Conflicts:
	libdw/libdw.map
	libdwfl/ChangeLog
	tests/ChangeLog

diff --cc libdw/libdw.map
index b53918c616ecf0d17b1f729330c97e161a931af1,eb3abc280429ea8b02988ebb609cbd63bca63b08..1195109a7c1d39ae502b2df9043ebb2fa3292dbb
--- 1/libdw/libdw.map
--- 2/libdw/libdw.map
+++ b/libdw/libdw.map
@@@ -185,18 -186,11 +186,27 @@@ ELFUTILS_0.136 
      *;
  } ELFUTILS_0.130;
  
- } ELFUTILS_0.136;
+ ELFUTILS_0.138 {
+   global:
+     # Replaced ELFUTILS_0.130 version, which has bug-compatibility wrapper.
+     dwfl_module_build_id;
+ 
+   local:
+     *;
+ } ELFUTILS_0.136;
++
 +ELFUTILS_0.138_UNWIND {
 +  global:
 +    # XXX new unwind stuff not decided yet
 +    dwarf_next_cfi;
 +    dwarf_getcfi;
 +    dwarf_getcfi_elf;
 +    dwarf_cfi_addrframe;
 +    dwarf_cfi_end;
 +    dwarf_cfi_setebl;
 +    dwarf_frame_cfa;
 +    dwarf_frame_register;
 +    dwarf_frame_return_address_register;
 +    dwfl_addrframe;
 +    dwfl_module_getcfi;
++} ELFUTILS_0.138;

diff --cc libdwfl/ChangeLog
index 46d1836ef6c4a23b1662c44cc6b0ae58b561ec4e,11aeafd91b125bd512116688b1560a58c3762315..60ff209a6aee29e1386b4539d0bfbb098a02c356
--- 1/libdwfl/ChangeLog
--- 2/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@@ -1,11 -1,15 +1,23 @@@
 +2007-02-10  Roland McGrath  <roland@redhat.com>
 +
 +      * libdwflP.h (struct Dwfl_Module): New members `cfi', `cfi_elf'.
 +      Add INTDECL for dwfl_module_getcfi.
 +      * dwfl_module_getcfi.c: New file.
 +      * dwfl_addrframe.c: New file.
 +      * Makefile.am (libdwfl_a_SOURCES): Add them.
 +
+ 2008-12-16  Roland McGrath  <roland@redhat.com>
+ 
+       * dwfl_module_build_id.c (dwfl_module_build_id): Define with alias and
+       symver magic to bind to ELFUTILS_0.138.
+       (_BUG_COMPAT_dwfl_module_build_id): New function, bug compatible
+       wrapper for ELFUTILS_0.130 version set.
+ 
+ 2008-12-18  Roland McGrath  <roland@redhat.com>
+ 
+       * derelocate.c (dwfl_module_relocate_address): Fix last fix: ET_DYN
+       addresses are taken as relative to MOD->low_addr.
+ 
  2008-12-15  Roland McGrath  <roland@redhat.com>
  
        * derelocate.c (dwfl_module_relocate_address): Apply main.bias, not

diff --cc tests/ChangeLog
index 876ae24b6fffecdf82729a4e835e6ce22583b950,958255a81b82859e91397f42e143ab4179ce5264..442aa29c7ff62943711c04d5060920a3838f39cd
--- 1/tests/ChangeLog
--- 2/tests/ChangeLog
+++ b/tests/ChangeLog
@@@ -1,9 -1,24 +1,30 @@@
 +2007-02-10  Roland McGrath  <roland@redhat.com>
 +
 +      * addrcfi.c: New file.
 +      * Makefile.am (noinst_PROGRAMS): Add it.
 +      (addrcfi_LDADD): New variable.
 +
+ 2008-12-31  Ulrich Drepper  <drepper@redhat.com>
+ 
+       * testfile44.S.bz2: Add tests for blendvpd and blendvps.
+       * testfile45.S.bz2: Likewise.
+       * testfile44.expect.bz2: Adjust accordingly.
+       * testfile45.expect.bz2: Likewise.
+ 
+ 2008-12-30  Ulrich Drepper  <drepper@redhat.com>
+ 
+       * testfile44.S.bz2: Add tests for blendpd and blendps.
+       * testfile45.S.bz2: Likewise.
+       * testfile44.expect.bz2: Adjust accordingly.
+       * testfile45.expect.bz2: Likewise.
+ 
+ 2008-12-19  Ulrich Drepper  <drepper@redhat.com>
+ 
+       * testfile44.S.bz2: Add tests for AMD 3DNOW.
+       * testfile45.S.bz2: Likewise.
+       * testfile44.expect.bz2: Adjust accordingly.
+       * testfile45.expect.bz2: Likewise.
+ 
  2008-11-26  Roland McGrath  <roland@redhat.com>
  
        * dwfl-bug-getmodules.c: New file.