patches/gcc/4.3.1/230-pr34571.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
     1 Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/64_all_gcc43-pr34571.patch
     2 http://gcc.gnu.org/PR34571
     3 
     4 2007-12-26  Rask Ingemann Lambertsen  <rask@sygehus.dk>
     5 
     6 	PR target/34571
     7 	* config/alpha/alpha.c (alpha_cannot_force_const_mem): Use
     8 	symbolic_operand.
     9 	* varasm.c (output_constant_pool_1): Fix typo.
    10 
    11 diff -durN gcc-4.3.1.orig/gcc/config/alpha/alpha.c gcc-4.3.1/gcc/config/alpha/alpha.c
    12 --- gcc-4.3.1.orig/gcc/config/alpha/alpha.c	2008-02-07 18:45:24.000000000 +0100
    13 +++ gcc-4.3.1/gcc/config/alpha/alpha.c	2008-06-10 14:58:24.000000000 +0200
    14 @@ -1113,8 +1113,7 @@
    15  static bool
    16  alpha_cannot_force_const_mem (rtx x)
    17  {
    18 -  enum rtx_code code = GET_CODE (x);
    19 -  return code == SYMBOL_REF || code == LABEL_REF || code == CONST;
    20 +  return symbolic_operand (x, GET_MODE (x));
    21  }
    22  
    23  /* We do not allow indirect calls to be optimized into sibling calls, nor
    24 diff -durN gcc-4.3.1.orig/gcc/varasm.c gcc-4.3.1/gcc/varasm.c
    25 --- gcc-4.3.1.orig/gcc/varasm.c	2007-12-05 22:55:10.000000000 +0100
    26 +++ gcc-4.3.1/gcc/varasm.c	2008-06-10 14:58:24.000000000 +0200
    27 @@ -3710,7 +3710,7 @@
    28        /* FALLTHRU  */
    29  
    30      case LABEL_REF:
    31 -      tmp = XEXP (x, 0);
    32 +      tmp = XEXP (tmp, 0);
    33        gcc_assert (!INSN_DELETED_P (tmp));
    34        gcc_assert (!NOTE_P (tmp)
    35  		  || NOTE_KIND (tmp) != NOTE_INSN_DELETED);