patches/gcc/4.3.1/260-uclibc-conf-noupstream.patch
author Daniel Zimmermann <netzimme@gmail.com>
Mon Nov 25 08:56:55 2013 +0100 (2013-11-25)
changeset 3255 4f3536b12be5
parent 746 b150d6f590fc
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
yann@552
     1
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_103-uclibc-conf-noupstream.patch
yann@552
     2
diff -durN gcc-4.3.1.orig/gcc/config.gcc gcc-4.3.1/gcc/config.gcc
yann@552
     3
--- gcc-4.3.1.orig/gcc/config.gcc	2008-06-10 14:58:09.000000000 +0200
yann@552
     4
+++ gcc-4.3.1/gcc/config.gcc	2008-06-10 14:58:36.000000000 +0200
yann@552
     5
@@ -2149,7 +2149,7 @@
yann@552
     6
         ;;
yann@552
     7
 sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
yann@552
     8
 sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
yann@552
     9
-  sh-*-linux* | sh[346lbe]*-*-linux* | \
yann@552
    10
+  sh*-*-linux* | sh[346lbe]*-*-linux* | \
yann@552
    11
   sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
yann@552
    12
    sh64-*-netbsd* | sh64l*-*-netbsd*)
yann@552
    13
 	tmake_file="${tmake_file} sh/t-sh sh/t-elf"