Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.4.4/400-pr42289-fix-libffi-build-on-arm-oabi.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
yann@2202 
     1
 
--- gcc-4.3.4/libffi/src/arm/sysv.S
yann@2202 
     2
 
+++ gcc-4.3.4/libffi/src/arm/sysv.S
yann@2202 
     3
 
@@ -235,7 +235,7 @@ ARM_FUNC_START ffi_closure_SYSV
yann@2202 
     4
 
 	stmfd	sp!, {ip, lr}
yann@2202 
     5
 
 	UNWIND .save	{r0, lr}
yann@2202 
     6
 
 	add	r2, sp, #8
yann@2202 
     7
 
-	.pad #16
yann@2202 
     8
 
+	UNWIND .pad #16
yann@2202 
     9
 
 	sub	sp, sp, #16
yann@2202 
    10
 
 	str	sp, [sp, #8]
yann@2202 
    11
 
 	add	r1, sp, #8
crosstool-ng