patches/gcc/4.2.3/230-libbackend_dep_gcov-iov.h.patch
author Daniel Zimmermann <netzimme@gmail.com>
Mon Nov 25 08:56:55 2013 +0100 (2013-11-25)
changeset 3255 4f3536b12be5
parent 431 8bde4c6ea47a
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@313
     1
diff -durN gcc-4.2.1.orig/gcc/Makefile.in gcc-4.2.1/gcc/Makefile.in
yann@313
     2
--- gcc-4.2.1.orig/gcc/Makefile.in	2007-05-31 17:37:38.000000000 +0200
yann@313
     3
+++ gcc-4.2.1/gcc/Makefile.in	2007-08-03 20:36:14.000000000 +0200
yann@313
     4
@@ -2660,7 +2660,7 @@
yann@313
     5
 # FIXME: writing proper dependencies for this is a *LOT* of work.
yann@313
     6
 libbackend.o : $(OBJS-common:.o=.c) $(out_file) \
yann@313
     7
   insn-config.h insn-flags.h insn-codes.h insn-constants.h \
yann@313
     8
-  insn-attr.h  $(DATESTAMP) $(BASEVER) $(DEVPHASE)
yann@313
     9
+  insn-attr.h  $(DATESTAMP) $(BASEVER) $(DEVPHASE) gcov-iov.h
yann@313
    10
 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \
yann@313
    11
 	  -DTARGET_NAME=\"$(target_noncanonical)\" \
yann@313
    12
 	  -DLOCALEDIR=\"$(localedir)\" \