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

Conflicts:
	backends/ChangeLog
	libebl/ChangeLog

diff --cc backends/ChangeLog
index d97903f5a2d0f63da0982a439e3178dbaf069fdf,4b48a8fa481c509eb464326255168e4444c9118d..df632d35e38ddc65e28461b73c9f20478c77e44d
--- 1/backends/ChangeLog
--- 2/backends/ChangeLog
+++ b/backends/ChangeLog
@@@ -1,13 -1,8 +1,18 @@@
 +2007-01-18  Roland McGrath  <roland@redhat.com>
 +
 +      * x86_64_cfi.c (x86_64_abi_cfi): New file.
 +      * Makefile.am (x86_64_SRCS): Add it.
 +      * x86_64_init.c (x86_64_init): Add initializer.
 +
 +      * i386_cfi.c (i386_abi_cfi): New file.
 +      * Makefile.am (i386_SRCS): Add it.
 +      * i386_init.c (i386_init): Initialize abi_cfi hook.
 +
+ 2009-04-01  Roland McGrath  <roland@redhat.com>
+ 
+       * sparc_reloc.def: Update table.
+       Data from Dave Miller <davem@davemloft.net>.
+ 
  2009-02-15  Roland McGrath  <roland@redhat.com>
  
        * ppc_attrs.c (ppc_check_object_attribute): Handle tag

diff --cc libebl/ChangeLog
index 47f58b7ff1631145a66e3f33fc6e5ecfd2b0fbb7,83319c702930da403509073cce7a17ae9a127502..2d501a365bd5c0fc402eac2fb7d00a6e3bb1604c
--- 1/libebl/ChangeLog
--- 2/libebl/ChangeLog
+++ b/libebl/ChangeLog
@@@ -1,12 -1,9 +1,18 @@@
 +2007-01-18  Roland McGrath  <roland@redhat.com>
 +
 +      * ebl-hooks.h: Add abi_cfi hook.
 +      * eblopenbackend.c (default_abi_cfi): New function.
 +      (fill_defaults): Add initializer.
 +      * eblabicfi.c: New file.
 +      * Makefile.am (gen_SOURCES): Add it.
 +      * libebl.h: Declare ebl_abi_cfi.
 +
+ 2009-04-01  Roland McGrath  <roland@redhat.com>
+ 
+       * eblsymboltypename.c (ebl_symbol_type_name): Add STT_GNU_IFUNC.
+ 
+       * eblauxvinfo.c (AUXV_TYPES): Add RANDOM and BASE_PLATFORM.
+ 
  2009-02-01  Ulrich Drepper  <drepper@redhat.com>
  
        * eblreloctypename.c (ebl_reloc_type_name): Return "<INVALID RELOC>"