patches/gcc/4.1.2/110-arm-eabi.patch
author Daniel Zimmermann <netzimme@gmail.com>
Mon Nov 25 08:56:55 2013 +0100 (2013-11-25)
changeset 3255 4f3536b12be5
parent 1 eeea35fbf182
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 --- gcc-4.1.2.orig/gcc/config.gcc	2007-03-04 23:25:37.000000000 +0100
     2 +++ gcc-4.1.2/gcc/config.gcc	2007-03-04 23:25:45.000000000 +0100
     3 @@ -674,7 +674,7 @@
     4  	tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h" 
     5  	tmake_file="${tmake_file} t-linux arm/t-arm"
     6  	case ${target} in
     7 -	arm*-*-linux-gnueabi)
     8 +	arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi)
     9  	    tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
    10  	    tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
    11    	    # The BPABI long long divmod functions return a 128-bit value in 
    12 --- gcc-4.1.2.orig/gcc/config/arm/linux-eabi.h	2005-11-15 15:32:13.000000000 +0100
    13 +++ gcc-4.1.2/gcc/config/arm/linux-eabi.h	2007-03-04 23:25:45.000000000 +0100
    14 @@ -53,7 +53,11 @@
    15  /* Use ld-linux.so.3 so that it will be possible to run "classic"
    16     GNU/Linux binaries on an EABI system.  */
    17  #undef LINUX_TARGET_INTERPRETER
    18 +#ifdef USE_UCLIBC
    19 +#define LINUX_TARGET_INTERPRETER "/lib/ld-uClibc.so.0"
    20 +#else
    21  #define LINUX_TARGET_INTERPRETER "/lib/ld-linux.so.3"
    22 +#endif
    23  
    24  /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
    25     use the GNU/Linux version, not the generic BPABI version.  */