Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.3.6/350-sh-without-headers.patch
author Daniel Zimmermann <netzimme@gmail.com>
Mon Nov 25 08:56:55 2013 +0100 (2013-11-25)
changeset 3255 4f3536b12be5
parent 2124 5dd0b83ae528
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/350-sh-without-headers.patch

     2 

     3 -= BEGIN original header =-

     4 On 20081011, Khem RAJ writes:

     5  You have to bar gcc trying to build unwinding at stage 1. Try the

     6  attached patch and see if it helps.

     7 

     8  gcc/config/sh/linux-unwind.h |    3 +++

     9  1 file changed, 3 insertions(+)

    10 

    11 -= END original header =-

    12 

    13 diff -durN gcc-4.3.3.orig/gcc/config/sh/linux-unwind.h gcc-4.3.3/gcc/config/sh/linux-unwind.h

    14 --- gcc-4.3.3.orig/gcc/config/sh/linux-unwind.h	2007-09-12 08:59:06.000000000 +0200

    15 +++ gcc-4.3.3/gcc/config/sh/linux-unwind.h	2009-01-27 22:28:57.000000000 +0100

    16 @@ -26,6 +26,8 @@

    17  the Free Software Foundation, 51 Franklin Street, Fifth Floor,

    18  Boston, MA 02110-1301, USA.  */

    19  

    20 +#ifndef inhibit_libc

    21 +

    22  /* Do code reading to identify a signal frame, and set the frame

    23     state data appropriately.  See unwind-dw2.c for the structs.  */

    24  

    25 @@ -251,3 +253,4 @@

    26    return _URC_NO_REASON;

    27  }

    28  #endif /* defined (__SH5__) */

    29 +#endif /* ifndef inhibit_libc */
crosstool-ng