]> git.ipfire.org Git - thirdparty/elfutils.git/commitdiff
Merge branch 'jankratochvil/forunwind-baseaddr-hookvars-corereport' into jankratochvi...
authorJan Kratochvil <jan.kratochvil@redhat.com>
Mon, 12 Nov 2012 20:29:00 +0000 (21:29 +0100)
committerJan Kratochvil <jan.kratochvil@redhat.com>
Mon, 12 Nov 2012 20:29:00 +0000 (21:29 +0100)
Conflicts:
libdw/libdw.map

1  2 
libdw/libdw.map

diff --cc libdw/libdw.map
index 853671f1c48de38c03eb2b7b7e74d82cb24a58e4,5a055e88c1508d0730fc8ad5a30d4167b0733e48..3398089b50376142fe9810eea8e6bf2619756117
@@@ -255,15 -255,7 +255,16 @@@ 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;
 +    dwfl_frame_state_core;
 +    dwfl_frame_state_data;
 +    dwfl_frame_unwind;
 +    dwfl_frame_state_pc;
 +    dwfl_frame_tid_get;
 +    dwfl_frame_thread_next;
  } ELFUTILS_0.149;