Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.3.4/250-sh-pr24836.patch
author Daniel Zimmermann <netzimme@gmail.com>
Mon Nov 25 08:56:55 2013 +0100 (2013-11-25)
changeset 3255 4f3536b12be5
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 Original patch from: ../4.3.2/250-sh-pr24836.patch

     2 

     3 -= BEGIN original header =-

     4 Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/74_all_sh-pr24836.patch

     5 http://sourceforge.net/mailarchive/forum.php?thread_id=8959304&forum_id=5348

     6 http://gcc.gnu.org/PR24836

     7 

     8 -= END original header =-

     9 

    10 diff -durN gcc-4.3.3.orig/gcc/configure gcc-4.3.3/gcc/configure

    11 --- gcc-4.3.3.orig/gcc/configure	2009-01-27 22:19:18.000000000 +0100

    12 +++ gcc-4.3.3/gcc/configure	2009-01-27 22:25:33.000000000 +0100

    13 @@ -20689,7 +20689,7 @@

    14  	tls_first_minor=14

    15  	tls_as_opt="-m64 -Aesame --fatal-warnings"

    16  	;;

    17 -  sh-*-* | sh[34]-*-*)

    18 +  sh-*-* | sh[34]*-*-*)

    19      conftest_s='

    20  	.section ".tdata","awT",@progbits

    21  foo:	.long	25

    22 diff -durN gcc-4.3.3.orig/gcc/configure.ac gcc-4.3.3/gcc/configure.ac

    23 --- gcc-4.3.3.orig/gcc/configure.ac	2009-01-27 22:19:18.000000000 +0100

    24 +++ gcc-4.3.3/gcc/configure.ac	2009-01-27 22:25:33.000000000 +0100

    25 @@ -2552,7 +2552,7 @@

    26  	tls_first_minor=14

    27  	tls_as_opt="-m64 -Aesame --fatal-warnings"

    28  	;;

    29 -  sh-*-* | sh[34]-*-*)

    30 +  sh-*-* | sh[34]*-*-*)

    31      conftest_s='

    32  	.section ".tdata","awT",@progbits

    33  foo:	.long	25
crosstool-ng