From a06d145de61475dd6c51a84ee294e1d51570bfdaa13835cfab86a1ead3d0cce3 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 4 Nov 2008 16:58:25 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemtap?expand=0&rev=28 --- stap-fix-dump_unwindsyms.patch | 23 +++++++++++++++++++++++ systemtap.changes | 5 +++++ systemtap.spec | 6 +++++- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 stap-fix-dump_unwindsyms.patch diff --git a/stap-fix-dump_unwindsyms.patch b/stap-fix-dump_unwindsyms.patch new file mode 100644 index 0000000..def6548 --- /dev/null +++ b/stap-fix-dump_unwindsyms.patch @@ -0,0 +1,23 @@ +commit 6f8b68010d8a11cbb97f225b16a3ef2f39f11fd8 +Author: Frank Ch. Eigler +Date: Wed Oct 29 16:31:39 2008 -0400 + + fix assertion error in translate.cxx:dump_unwindsyms on some kernels + +diff --git a/translate.cxx b/translate.cxx +index ee6b21c..4112855 100644 +--- a/translate.cxx ++++ b/translate.cxx +@@ -4481,9 +4481,10 @@ dump_unwindsyms (Dwfl_Module *m, + secname = dwfl_module_relocation_info (m, ki, NULL); + } + +- if (n == 1 && modname == "kernel" && secname && secname[0] == '\0') ++ if (n == 1 && modname == "kernel") + { +- // This is a symbol within a relocatable kernel image. ++ // This is a symbol within a (possibly relocatable) ++ // kernel image. + secname = "_stext"; + // NB: don't subtract session.sym_stext, which could be inconveniently NULL. + // Instead, sym_addr will get compensated later via extra_offset. diff --git a/systemtap.changes b/systemtap.changes index 8b59e13..d0c2ad8 100644 --- a/systemtap.changes +++ b/systemtap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 4 13:57:24 CET 2008 - tiwai@suse.de + +- Fix systemtap assertion with CONFIG_RELOCATABLE (bnc#440351) + ------------------------------------------------------------------- Thu Sep 11 17:14:47 CEST 2008 - tiwai@suse.de diff --git a/systemtap.spec b/systemtap.spec index f6cb567..cb79b90 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -25,7 +25,7 @@ BuildRequires: latex2html %define package_version 20080906 License: GPL v2 or later Version: 0.7.1 -Release: 21 +Release: 24 Summary: Instrumentation System Group: Development/Tools/Debuggers Url: http://sourceware.org/systemtap/ @@ -34,6 +34,7 @@ Url: http://sourceware.org/systemtap/ Source: ftp://sources.redhat.com/pub/systemtap/snapshots/systemtap-%{package_version}.tar.bz2 Patch: systemtap-docdir-fix.diff Patch1: systemtap-old-autoconf-fix.diff +Patch2: stap-fix-dump_unwindsyms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -57,6 +58,7 @@ Authors: %if %suse_version < 1020 %patch1 %endif +%patch2 -p1 %build autoreconf -fi @@ -81,6 +83,8 @@ rm -rf ${RPM_BUILD_ROOT} %dir %attr(0755,root,root) /var/cache/systemtap %changelog +* Tue Nov 04 2008 tiwai@suse.de +- Fix systemtap assertion with CONFIG_RELOCATABLE (bnc#440351) * Thu Sep 11 2008 tiwai@suse.de - updated to snapshot 20080906 * Fix / clean up autotools stuff