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

Conflicts:
	libdw/ChangeLog
	tests/ChangeLog
	tests/Makefile.am

diff --cc libdw/ChangeLog
index abc4ffb121e8980298300710c1dd71f0384e4099,0e317d7c77dca7be4c01b599e5d09618bd678cae..a5c8548a01774a548328f1f6ac0975418ec8c33c
--- 1/libdw/ChangeLog
--- 2/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@@ -1,57 -1,14 +1,68 @@@
 +2009-04-19  Roland McGrath  <roland@redhat.com>
 +
 +      * libdw.map (ELFUTILS_0.141): Add dwfl_addrframe,
 +      dwfl_module_dwarf_cfi, dwfl_module_eh_cfi.
 +
 +      * libdwP.h (struct Dwarf): Add member `cfi'.
 +      * dwarf_end.c (dwarf_end): Call __libdw_destroy_frame_cache on it.
 +      * dwarf_getcfi.c: New file.
 +      * dwarf_getcfi_elf.c: New file.
 +      * dwarf_cfi_end.c: New file.
 +      * dwarf_cfi_addrframe.c: New file.
 +      * dwarf_frame_cfa.c: New file.
 +      * dwarf_frame_register.c: New file.
 +      * dwarf_frame_return_address_register.c: New file.
 +      * Makefile.am (libdw_a_SOURCES): Add them.
 +      * unwind.h: Declare those functions.
 +      * libdw.map (ELFUTILS_0.141): Export them.
 +
 +      * dwarf_getlocation.c (__libdw_intern_expression): New function,
 +      broken out of ...
 +      (getlocation): ... here, call it.
 +      * libdwP.h: Declare it.
 +
 +      * cie.c: New file.
 +      * fde.c: New file.
 +      * frame-cache.c: New file.
 +      * cfi.c: New file.
 +      * cfi.h: New file.
 +      * encoded-value.h: New file.
 +      * Makefile.am (libdw_a_SOURCES, noinst_HEADERS): Add them.
 +      * libdwP.h: Add DWARF_E_INVALID_CFI to errors enum.
 +      * dwarf_error.c (errmsgs): Add element for it.
 +
 +      * dwarf_next_cfi.c: New file.
 +      * Makefile.am (libdw_a_SOURCES): Add it.
 +      * libdw.h (Dwarf_CIE, Dwarf_FDE, Dwarf_CIE_Entry): New types.
 +      Declare dwarf_next_cfi.
 +      * libdw.map (ELFUTILS_0.141): Add dwarf_next_cfi.
 +
 +      * memory-access.h [! ALLOW_UNALIGNED]
 +      (read_2ubyte_unaligned): Renamed to ...
 +      (read_2ubyte_unaligned_1): ... this.  Take bool rather than Dwarf *.
 +      (read_2ubyte_unaligned): Define as macro passing dbg->other_byte_order.
 +      (read_2sbyte_unaligned): Likewise.
 +      (read_4ubyte_unaligned): Likewise.
 +      (read_4sbyte_unaligned): Likewise.
 +      (read_8ubyte_unaligned): Likewise.
 +      (read_8sbyte_unaligned): Likewise.
 +
 +2009-04-03  Roland McGrath  <roland@redhat.com>
 +
 +      * libdwP.h (IDX_eh_frame): Remove it.
 +      * dwarf_begin_elf.c (dwarf_scnnames): Remove its element.
 +
+ 2009-05-07  Roland McGrath  <roland@redhat.com>
+ 
+       * dwarf_getmacros.c (dwarf_getmacros): Use absolute section offset in
+       return value and OFFSET argument, not CU-relative.  Only fetch the
+       attribute data when called with OFFSET of 0.
+ 
+ 2009-05-07  Petr Machata  <pmachata@redhat.com>
+ 
+       * dwarf_getmacros.c (dwarf_getmacros): Take into account offset in
+       DW_AT_macro_info attribute of CU DIE.
+ 
  2009-04-15  Roland McGrath  <roland@redhat.com>
  
        * dwarf.h (DW_CIE_ID): Removed.

diff --cc tests/ChangeLog
index e8bb53ae49ebd17000670ff60c8e5286534030a4,e31dcbb46616846366a0ec02e0d5babb40cbd7f5..bfb434b12e97dd874b6b2f3ebb15deea628398a3
--- 1/tests/ChangeLog
--- 2/tests/ChangeLog
+++ b/tests/ChangeLog
@@@ -1,9 -1,11 +1,17 @@@
 +2009-04-19  Roland McGrath  <roland@redhat.com>
 +
 +      * addrcfi.c: New file.
 +      * Makefile.am (noinst_PROGRAMS): Add it.
 +      (addrcfi_LDADD): New variable.
 +
+ 2009-05-07  Petr Machata  <pmachata@redhat.com>
+ 
+       * testfile51.bz2: New data file.
+       * dwarf-getmacros.c: New test core.
+       * run-dwarf-getmacros.sh: New test wrapper.
+       * Makefile.am (TESTS, EXTRA_DIST, noinst_PROGRAMS): Add them.
+       (dwarf_getmacros_LDADD): New variable.
+ 
  2009-04-23  Ulrich Drepper  <drepper@redhat.com>
  
        * Makefile [BUILD_STATIC] (libdw): Add $(zip_LIBS).

diff --cc tests/Makefile.am
index 255537958f2a8ed7b4145a85cfe21e459120e76b,956b7253d37eb2b69bf2a82cb24d310e4d25f5b9..54d2c61ad919d4fd0a13620dd74a2aa9ffcc27bf
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -60,8 -60,8 +60,7 @@@ noinst_PROGRAMS = arextract arsymtest n
                  find-prologues funcretval allregs rdwrmmap \
                  dwfl-bug-addr-overflow arls dwfl-bug-fd-leak \
                  dwfl-addr-sect dwfl-bug-report early-offscn \
-                 dwfl-bug-getmodules addrcfi
 -                dwfl-bug-getmodules dwarf-getmacros
--# get-ciefde
++                dwfl-bug-getmodules dwarf-getmacros addrcfi
  asm_TESTS = asm-tst1 asm-tst2 asm-tst3 asm-tst4 asm-tst5 \
            asm-tst6 asm-tst7 asm-tst8 asm-tst9
  
@@@ -233,7 -234,7 +233,8 @@@ dwfl_bug_report_LDADD = $(libdw) $(libe
  dwfl_bug_getmodules_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
  dwfl_addr_sect_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
  sha1_tst_LDADD = $(libeu) $(libmudflap)
+ dwarf_getmacros_LDADD = $(libdw)
 +addrcfi_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
  
  CLEANFILES = xxx *.gcno *.gcda *gconv