patches/gcc/4.4.7/200-libiberty.h-asprintf.patch
author Daniel Zimmermann <netzimme@gmail.com>
Mon Nov 25 08:56:55 2013 +0100 (2013-11-25)
changeset 3255 4f3536b12be5
parent 2406 95e0c248d257
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@2149
     1
diff -durN gcc-4.4.5.orig/include/libiberty.h gcc-4.4.5/include/libiberty.h
yann@2149
     2
--- gcc-4.4.5.orig/include/libiberty.h	2008-06-24 03:42:31.000000000 +0200
yann@2149
     3
+++ gcc-4.4.5/include/libiberty.h	2010-10-09 23:01:30.000000000 +0200
yann@2149
     4
@@ -595,8 +595,11 @@
yann@2149
     5
 /* Like sprintf but provides a pointer to malloc'd storage, which must
yann@2149
     6
    be freed by the caller.  */
yann@2149
     7
 
yann@2149
     8
+/* asprintf may be declared as a macro by glibc with __USE_FORTIFY_LEVEL.  */
yann@2149
     9
+#ifndef asprintf
yann@2149
    10
 extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2;
yann@2149
    11
 #endif
yann@2149
    12
+#endif
yann@2149
    13
 
yann@2149
    14
 #if !HAVE_DECL_VASPRINTF
yann@2149
    15
 /* Like vsprintf but provides a pointer to malloc'd storage, which