From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Mon, 12 Nov 2012 20:29:00 +0000 (+0100)
Subject: Merge branch 'jankratochvil/forunwind-baseaddr-hookvars-corereport' into jankratochvi... 
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c38afcd25b43b54c92fec3bc399dc4cfcd1d1b2e;p=thirdparty%2Felfutils.git

Merge branch 'jankratochvil/forunwind-baseaddr-hookvars-corereport' into jankratochvil/unwind

Conflicts:
	libdw/libdw.map
---

c38afcd25b43b54c92fec3bc399dc4cfcd1d1b2e
diff --cc libdw/libdw.map
index 853671f1c,5a055e88c..3398089b5
--- a/libdw/libdw.map
+++ b/libdw/libdw.map
@@@ -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;