patches/gcc/4.4.2/270-sh-pr24836.patch
author Daniel Zimmermann <netzimme@gmail.com>
Mon Nov 25 08:56:55 2013 +0100 (2013-11-25)
changeset 3255 4f3536b12be5
parent 1544 2228ea3f6b79
permissions -rw-r--r--
debug/strace: pump version to 4.7 and 4.8

Pump version for strace to 4.7 and 4.8.
Add patch from strace mainline.


Work around conflict between <sys/ptrace.h> and <linux/ptrace.h>

Since glibc-2.18~39 <sys/ptrace.h> defines ptrace_peeksiginfo_args
which collides with <linux/ptrace.h>.

* configure.ac: Check for `struct ptrace_peeksiginfo_args' in
<sys/ptrace.h>.
* process.c: Work around potential conflict between <sys/ptrace.h>
and <linux/ptrace.h> by redefining ptrace_peeksiginfo_args.
* signal.c: Likewise.
* syscall.c: Likewise.
* util.c: Likewise.
http://sourceforge.net/p/strace/code/ci/0b4060f61f1bb101b5d8d084714b7d2feacdb199/

Signed-off-by: "Daniel Zimmermann" <netzimme@gmail.com>
Message-Id: <67b082cf1cdc8276eb4a.1385366288@haus-VirtualBox>
Patchwork-Id: 293842
     1 diff -durN gcc-4.4.0.orig/gcc/configure gcc-4.4.0/gcc/configure
     2 --- gcc-4.4.0.orig/gcc/configure	2009-05-27 21:38:08.000000000 +0200
     3 +++ gcc-4.4.0/gcc/configure	2009-05-27 21:38:42.000000000 +0200
     4 @@ -22205,7 +22205,7 @@
     5  	tls_first_minor=14
     6  	tls_as_opt="-m64 -Aesame --fatal-warnings"
     7  	;;
     8 -  sh-*-* | sh[34]-*-*)
     9 +  sh-*-* | sh[34]*-*-*)
    10      conftest_s='
    11  	.section ".tdata","awT",@progbits
    12  foo:	.long	25
    13 diff -durN gcc-4.4.0.orig/gcc/configure.ac gcc-4.4.0/gcc/configure.ac
    14 --- gcc-4.4.0.orig/gcc/configure.ac	2009-05-27 21:38:08.000000000 +0200
    15 +++ gcc-4.4.0/gcc/configure.ac	2009-05-27 21:38:42.000000000 +0200
    16 @@ -2673,7 +2673,7 @@
    17  	tls_first_minor=14
    18  	tls_as_opt="-m64 -Aesame --fatal-warnings"
    19  	;;
    20 -  sh-*-* | sh[34]-*-*)
    21 +  sh-*-* | sh[34]*-*-*)
    22      conftest_s='
    23  	.section ".tdata","awT",@progbits
    24  foo:	.long	25