patches/gcc/4.3.4/280-c99-complex-ugly-hack.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
thomas@1461
     1
Original patch from: ../4.3.2/280-c99-complex-ugly-hack.patch
thomas@1461
     2
thomas@1461
     3
-= BEGIN original header =-
thomas@1461
     4
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_303-c99-complex-ugly-hack.patch
thomas@1461
     5
-= END original header =-
thomas@1461
     6
thomas@1461
     7
diff -durN gcc-4.3.3.orig/libstdc++-v3/configure gcc-4.3.3/libstdc++-v3/configure
thomas@1461
     8
--- gcc-4.3.3.orig/libstdc++-v3/configure	2008-07-07 21:49:54.000000000 +0200
thomas@1461
     9
+++ gcc-4.3.3/libstdc++-v3/configure	2009-01-27 22:25:39.000000000 +0100
thomas@1461
    10
@@ -38935,6 +38935,9 @@
thomas@1461
    11
 cat >>conftest.$ac_ext <<_ACEOF
thomas@1461
    12
 /* end confdefs.h.  */
thomas@1461
    13
 #include <complex.h>
thomas@1461
    14
+#ifdef __UCLIBC__
thomas@1461
    15
+#error ugly hack to make sure configure test fails here for cross until uClibc supports the complex funcs
thomas@1461
    16
+#endif
thomas@1461
    17
 int
thomas@1461
    18
 main ()
thomas@1461
    19
 {