diff options
| author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2012-11-12 21:29:00 +0100 |
|---|---|---|
| committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2012-11-12 21:29:00 +0100 |
| commit | c38afcd25b43b54c92fec3bc399dc4cfcd1d1b2e (patch) | |
| tree | 8ac8f39e33a3da97581e0d85d968329a47a3d779 | |
| parent | 5a8c8a4a84ff4639fcda26f9d3fd88bd8e591a5c (diff) | |
| parent | db7a2002535caa0c06482afb47d5185c1cf20c0c (diff) | |
| download | elfutils-c38afcd25b43b54c92fec3bc399dc4cfcd1d1b2e.tar.gz | |
Merge branch 'jankratochvil/forunwind-baseaddr-hookvars-corereport' into jankratochvil/unwind
Conflicts:
libdw/libdw.map
| -rw-r--r-- | libdw/libdw.map | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libdw/libdw.map b/libdw/libdw.map index 853671f1..3398089b 100644 --- a/libdw/libdw.map +++ b/libdw/libdw.map @@ -255,8 +255,9 @@ ELFUTILS_0.149 { dwfl_dwarf_line; } ELFUTILS_0.148; -ELFUTILS_0.155 { +ELFUTILS_0.156 { global: + dwfl_core_filename_report; dwfl_report_elf_baseaddr; dwfl_fd_find_debuginfo; dwfl_frame_state_pid; |