patches/gcc/4.3.1/170-libiberty-pic.patch
author Daniel Zimmermann <netzimme@gmail.com>
Mon Nov 25 08:56:55 2013 +0100 (2013-11-25)
changeset 3255 4f3536b12be5
parent 746 b150d6f590fc
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@552
     1
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/51_all_gcc-3.4-libiberty-pic.patch
yann@552
     2
diff -durN gcc-4.3.1.orig/libiberty/Makefile.in gcc-4.3.1/libiberty/Makefile.in
yann@552
     3
--- gcc-4.3.1.orig/libiberty/Makefile.in	2007-07-25 08:26:45.000000000 +0200
yann@552
     4
+++ gcc-4.3.1/libiberty/Makefile.in	2008-06-10 14:58:02.000000000 +0200
yann@552
     5
@@ -225,6 +225,7 @@
yann@552
     6
 	  $(AR) $(AR_FLAGS) $(TARGETLIB) \
yann@552
     7
 	    $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
yann@552
     8
 	  $(RANLIB) $(TARGETLIB); \
yann@552
     9
+	  cp $(TARGETLIB) ../ ; \
yann@552
    10
 	  cd ..; \
yann@552
    11
 	else true; fi
yann@552
    12