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 c08ba9d616246cd470e224a38b12177f8a86c56b..27eaed6f5f099a04fa0d4a17c5a4da62b55f2f73 100644 (file)
--- 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 0da34abe5fbc45dd610b4353a273cae898633584..8ab1a35baef6162f255b5464e11b6d181ca2aa67 100644 (file)
--- 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;