summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>2009-06-24 17:11:33 -0700
committerRoland McGrath <roland@redhat.com>2009-06-24 17:11:33 -0700
commit4f790061d10e6ca73a30a4c0993f4c0b21faeae8 (patch)
treed15f622c6b83db929403879939c00c286d4c2bf1
parenta8371842a3e6a0cac75dd78d26e4afe5271b4024 (diff)
Update version set for merging.upstream/roland/unwind
-rw-r--r--libdw/ChangeLog9
-rw-r--r--libdw/libdw.map2
2 files changed, 6 insertions, 5 deletions
diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 6b14e270..b9902130 100644
--- 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 8b37bfe2..4f47e309 100644
--- 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;