From: Dmitry V. Levin <ldv@altlinux.org>
Date: Wed, 11 Oct 2006 23:11:43 +0000 (+0000)
Subject: 2006-10-06  Dmitry V. Levin  <ldv@altlinux.org>
X-Git-Tag: v4.5.18~268
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9633942c07427ed51caea0e73f139e964d1a19cc;p=strace

2006-10-06  Dmitry V. Levin  <ldv@altlinux.org>

	* strace.c [!USE_PROCFS] (trace): Presence of PT_GETSIGINFO
	macro does not mean that PT_CR_IPSR and PT_CR_IIP macros are
	also defined, so check them along with PT_GETSIGINFO.
	Fixes RH#209856.
---

diff --git a/ChangeLog b/ChangeLog
index c08ba9d6..27eaed6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-06  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* strace.c [!USE_PROCFS] (trace): Presence of PT_GETSIGINFO
+	macro does not mean that PT_CR_IPSR and PT_CR_IIP macros are
+	also defined, so check them along with PT_GETSIGINFO.
+	Fixes RH#209856.
+
 2006-09-01  Dmitry V. Levin  <ldv@altlinux.org>
 
 	* file.c (print_xattr_val): Fix memory corruption bug reported
diff --git a/strace.c b/strace.c
index 0da34abe..8ab1a35b 100644
--- a/strace.c
+++ b/strace.c
@@ -2261,7 +2261,7 @@ Process %d attached (waiting for parent)\n",
 			if (!cflag
 			    && (qual_flags[WSTOPSIG(status)] & QUAL_SIGNAL)) {
 				unsigned long addr = 0, pc = 0;
-#ifdef PT_GETSIGINFO
+#if defined(PT_CR_IPSR) && defined(PT_CR_IIP) && defined(PT_GETSIGINFO)
 #				define PSR_RI	41
 				struct siginfo si;
 				unsigned long psr;