patches/gcc/4.3.4/320-alpha-signal_h.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/320-alpha-signal_h.patch
     2 
     3 -= BEGIN original header =-
     4 -= END original header =-
     5 
     6 diff -durN gcc-4.3.3.orig/gcc/config/alpha/linux-unwind.h gcc-4.3.3/gcc/config/alpha/linux-unwind.h
     7 --- gcc-4.3.3.orig/gcc/config/alpha/linux-unwind.h	2006-10-26 21:31:09.000000000 +0200
     8 +++ gcc-4.3.3/gcc/config/alpha/linux-unwind.h	2009-01-27 22:25:49.000000000 +0100
     9 @@ -29,6 +29,9 @@
    10  /* Do code reading to identify a signal frame, and set the frame
    11     state data appropriately.  See unwind-dw2.c for the structs.  */
    12  
    13 +/* Don't use this if inhibit_libc is set
    14 +   The build for this target will fail trying to include missing headers */
    15 +#ifndef inhibit_libc
    16  #include <signal.h>
    17  #include <sys/ucontext.h>
    18  
    19 @@ -80,3 +83,4 @@
    20    fs->retaddr_column = 64;
    21    return _URC_NO_REASON;
    22  }
    23 +#endif /* inhibit_libc */