patches/gcc/4.3.1/350-sh-without-headers.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@917
     1
On 20081011, Khem RAJ writes:
yann@917
     2
 You have to bar gcc trying to build unwinding at stage 1. Try the
yann@917
     3
 attached patch and see if it helps.
yann@917
     4
yann@917
     5
 gcc/config/sh/linux-unwind.h |    3 +++
yann@917
     6
 1 file changed, 3 insertions(+)
yann@917
     7
yann@917
     8
Index: gcc-4_2-branch/gcc/config/sh/linux-unwind.h
yann@917
     9
===================================================================
yann@917
    10
--- gcc-4_2-branch.orig/gcc/config/sh/linux-unwind.h	2008-07-01 17:24:40.000000000 -0700
yann@917
    11
+++ gcc-4_2-branch/gcc/config/sh/linux-unwind.h	2008-07-01 17:25:47.000000000 -0700
yann@917
    12
@@ -26,6 +26,8 @@ along with this program; see the file CO
yann@917
    13
 the Free Software Foundation, 51 Franklin Street, Fifth Floor,
yann@917
    14
 Boston, MA 02110-1301, USA.  */
yann@917
    15
 
yann@917
    16
+#ifndef inhibit_libc
yann@917
    17
+
yann@917
    18
 /* Do code reading to identify a signal frame, and set the frame
yann@917
    19
    state data appropriately.  See unwind-dw2.c for the structs.  */
yann@917
    20
 
yann@917
    21
@@ -251,3 +253,4 @@ sh_fallback_frame_state (struct _Unwind_
yann@917
    22
   return _URC_NO_REASON;
yann@917
    23
 }
yann@917
    24
 #endif /* defined (__SH5__) */
yann@917
    25
+#endif /* ifndef inhibit_libc */
yann@917
    26