mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2024-12-25 15:31:05 +00:00
a128e6fb54
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.
0b4060f61f/
Signed-off-by: "Daniel Zimmermann" <netzimme@gmail.com>
Message-Id: <67b082cf1cdc8276eb4a.1385366288@haus-VirtualBox>
Patchwork-Id: 293842
79 lines
2.3 KiB
Diff
79 lines
2.3 KiB
Diff
Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
|
|
Date: 2013-08-26
|
|
Initial Package Version: 4.8
|
|
Upstream Status: Unknown
|
|
Origin: Unknown
|
|
Description: Fixes compilation with glibc-2.18.
|
|
From OpenSuse factory, found in strace-4.8-2.1.src.rpm by rpmfind.net.
|
|
http://download.opensuse.org/factory/repo/src-oss/suse/strace-4.8-2.1.src.rpm
|
|
Their changelog reports:
|
|
* Wed Aug 14 2013 schwab@suse.de
|
|
- strace-linux-ptrace-h.patch: handle conflict with struct
|
|
ptrace_peeksiginfo_args between <sys/ptrace.h> and <linux/ptrace.h>
|
|
|
|
|
|
Index: strace-4.8/process.c
|
|
===================================================================
|
|
--- strace-4.8.orig/process.c
|
|
+++ strace-4.8/process.c
|
|
@@ -63,9 +63,11 @@
|
|
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
|
|
# define pt_all_user_regs XXX_pt_all_user_regs
|
|
# endif
|
|
+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
|
|
# include <linux/ptrace.h>
|
|
# undef ia64_fpreg
|
|
# undef pt_all_user_regs
|
|
+# undef ptrace_peeksiginfo_args
|
|
#endif
|
|
|
|
#if defined(SPARC64)
|
|
Index: strace-4.8/signal.c
|
|
===================================================================
|
|
--- strace-4.8.orig/signal.c
|
|
+++ strace-4.8/signal.c
|
|
@@ -51,9 +51,11 @@
|
|
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
|
|
# define pt_all_user_regs XXX_pt_all_user_regs
|
|
# endif
|
|
+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
|
|
# include <linux/ptrace.h>
|
|
# undef ia64_fpreg
|
|
# undef pt_all_user_regs
|
|
+# undef ptrace_peeksiginfo_args
|
|
#endif
|
|
|
|
#ifdef IA64
|
|
Index: strace-4.8/syscall.c
|
|
===================================================================
|
|
--- strace-4.8.orig/syscall.c
|
|
+++ strace-4.8/syscall.c
|
|
@@ -48,9 +48,11 @@
|
|
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
|
|
# define pt_all_user_regs XXX_pt_all_user_regs
|
|
# endif
|
|
+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
|
|
# include <linux/ptrace.h>
|
|
# undef ia64_fpreg
|
|
# undef pt_all_user_regs
|
|
+# undef ptrace_peeksiginfo_args
|
|
#endif
|
|
|
|
#if defined(SPARC64)
|
|
Index: strace-4.8/util.c
|
|
===================================================================
|
|
--- strace-4.8.orig/util.c
|
|
+++ strace-4.8/util.c
|
|
@@ -55,9 +55,11 @@
|
|
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
|
|
# define pt_all_user_regs XXX_pt_all_user_regs
|
|
# endif
|
|
+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
|
|
# include <linux/ptrace.h>
|
|
# undef ia64_fpreg
|
|
# undef pt_all_user_regs
|
|
+# undef ptrace_peeksiginfo_args
|
|
#endif
|
|
|
|
int
|