patches/gcc/4.4.6/260-sh-libgcc-stacks.patch
author Daniel Zimmermann <netzimme@gmail.com>
Mon Nov 25 08:56:55 2013 +0100 (2013-11-25)
changeset 3255 4f3536b12be5
parent 2149 98b7806295cc
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.5.orig/gcc/config/sh/lib1funcs.asm gcc-4.4.5/gcc/config/sh/lib1funcs.asm
     2 --- gcc-4.4.5.orig/gcc/config/sh/lib1funcs.asm	2009-04-10 01:23:07.000000000 +0200
     3 +++ gcc-4.4.5/gcc/config/sh/lib1funcs.asm	2010-10-09 23:04:22.000000000 +0200
     4 @@ -30,6 +30,11 @@
     5  !! recoded in assembly by Toshiyasu Morita
     6  !! tm@netcom.com
     7  
     8 +#if defined(__ELF__) && defined(__linux__)
     9 +.section .note.GNU-stack,"",%progbits
    10 +.previous
    11 +#endif
    12 +
    13  /* SH2 optimizations for ___ashrsi3, ___ashlsi3, ___lshrsi3 and
    14     ELF local label prefixes by J"orn Rennecke
    15     amylaar@cygnus.com  */
    16 diff -durN gcc-4.4.5.orig/gcc/config/sh/linux-atomic.asm gcc-4.4.5/gcc/config/sh/linux-atomic.asm
    17 --- gcc-4.4.5.orig/gcc/config/sh/linux-atomic.asm	2009-04-10 01:23:07.000000000 +0200
    18 +++ gcc-4.4.5/gcc/config/sh/linux-atomic.asm	2010-10-09 23:04:22.000000000 +0200
    19 @@ -136,3 +136,6 @@
    20  ATOMIC_FETCH_AND_COMBOP(nand,and,not,4,l,mov)
    21  
    22  #endif /* ! __SH5__ */
    23 +
    24 +.section .note.GNU-stack,"",%progbits
    25 +.previous