patches/gcc/4.7.0/000-gcc-bug-54369.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 Author: ebotcazou
     2 Date: Sun Sep  2 10:36:54 2012
     3 New Revision: 190859
     4 
     5 URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=190859
     6 Log:
     7     PR rtl-optimization/54369
     8     * config/mips/mips.c (mips_reorg): Invoke cleanup_barriers before
     9     calling dbr_schedule.
    10     * config/sparc/sparc.c (sparc_reorg): Likewise.
    11 
    12 Modified:
    13     branches/gcc-4_7-branch/gcc/ChangeLog
    14     branches/gcc-4_7-branch/gcc/config/mips/mips.c
    15     branches/gcc-4_7-branch/gcc/config/sparc/sparc.c
    16 ---
    17 --- gcc-4_7-branch/gcc/config/mips/mips.c	2012/09/02 10:36:27	190858
    18 +++ gcc-4_7-branch/gcc/config/mips/mips.c	2012/09/02 10:36:54	190859
    19 @@ -15415,7 +15415,10 @@
    20      }
    21  
    22    if (optimize > 0 && flag_delayed_branch)
    23 -    dbr_schedule (get_insns ());
    24 +    {
    25 +      cleanup_barriers ();
    26 +      dbr_schedule (get_insns ());
    27 +    }
    28    mips_reorg_process_insns ();
    29    if (!TARGET_MIPS16
    30        && TARGET_EXPLICIT_RELOCS
    31 --- gcc-4_7-branch/gcc/config/sparc/sparc.c	2012/09/02 10:36:27	190858
    32 +++ gcc-4_7-branch/gcc/config/sparc/sparc.c	2012/09/02 10:36:54	190859
    33 @@ -10663,7 +10663,10 @@
    34    /* We need to have the (essentially) final form of the insn stream in order
    35       to properly detect the various hazards.  Run delay slot scheduling.  */
    36    if (optimize > 0 && flag_delayed_branch)
    37 -    dbr_schedule (get_insns ());
    38 +    {
    39 +      cleanup_barriers ();
    40 +      dbr_schedule (get_insns ());
    41 +    }
    42  
    43    /* Now look for specific patterns in the insn stream.  */
    44    for (insn = get_insns (); insn; insn = next)
    45