Backport a debian change

SVN-Revision: 5754

diff --git a/utils/strace/patches/01-linux_sigcontext.patch b/utils/strace/patches/01-linux_sigcontext.patch
index f39fa113e600e4718d92d34cc01d29e8d424b150..d42a3d911e0069775456b14fa95bd14a5125e9d9 100644 (file)
--- a/utils/strace/patches/01-linux_sigcontext.patch
+++ b/utils/strace/patches/01-linux_sigcontext.patch
@@ -1,6 +1,6 @@
 diff -urN strace-4.5.14/signal.c strace-4.5.14.new/signal.c
 --- strace-4.5.14/signal.c     2006-01-12 23:34:50.000000000 +0100
-+++ strace-4.5.14.new/signal.c 2006-11-14 18:25:18.000000000 +0100
++++ strace-4.5.14.new/signal.c 2006-12-10 15:14:20.000000000 +0100
 @@ -66,7 +66,7 @@
  
  
@@ -22,9 +22,21 @@ diff -urN strace-4.5.14/signal.c strace-4.5.14.new/signal.c
        } else {
                tcp->u_rval = tcp->u_error = 0;
                if(tcp->u_arg[0] == 0)
+diff -urN strace-4.5.14/strace.c strace-4.5.14.new/strace.c
+--- strace-4.5.14/strace.c     2006-01-12 10:50:49.000000000 +0100
++++ strace-4.5.14.new/strace.c 2006-12-10 15:15:01.000000000 +0100
+@@ -2251,7 +2251,7 @@
+                       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;
 diff -urN strace-4.5.14/system.c strace-4.5.14.new/system.c
 --- strace-4.5.14/system.c     2006-01-12 22:21:06.000000000 +0100
-+++ strace-4.5.14.new/system.c 2006-11-14 17:39:30.000000000 +0100
++++ strace-4.5.14.new/system.c 2006-12-10 15:14:20.000000000 +0100
 @@ -78,6 +78,7 @@
  #endif