Update version set for merging.

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 6b14e2705e9884e5d07666c8aedb8fc38652cbff..b9902130f22a64298585ed07341d7437206249d7 100644 (file)
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,6 +1,6 @@
-2009-04-19  Roland McGrath  <roland@redhat.com>
+2009-06-24  Roland McGrath  <roland@redhat.com>
 
-       * libdw.map (ELFUTILS_0.141): Add dwfl_addrframe,
+       * libdw.map (ELFUTILS_0.142): Add dwfl_addrframe,
        dwfl_module_dwarf_cfi, dwfl_module_eh_cfi.
 
        * libdwP.h (struct Dwarf): Add member `cfi'.
@@ -14,7 +14,7 @@
        * 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.
+       * libdw.map (ELFUTILS_0.142): Export them.
 
        * dwarf_getlocation.c (__libdw_intern_expression): New function,
        broken out of ...
@@ -35,7 +35,8 @@
        * 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.
+       * libdw.map (ELFUTILS_0.142): New set, inherits from ELFUTILS_0.136.
+       Add dwarf_next_cfi.
 
        * memory-access.h [! ALLOW_UNALIGNED]
        (read_2ubyte_unaligned): Renamed to ...

diff --git a/libdw/libdw.map b/libdw/libdw.map
index 8b37bfe214fc8274abddf159e35e40d5de32206f..4f47e309035921cf51cd5022401a4011672bbcab 100644 (file)
--- a/libdw/libdw.map
+++ b/libdw/libdw.map
@@ -195,7 +195,7 @@ ELFUTILS_0.138 {
     *;
 } ELFUTILS_0.136;
 
-ELFUTILS_0.141_UNWIND {
+ELFUTILS_0.142 {
   global:
     dwarf_next_cfi;
     dwarf_getcfi;