patches/gcc/4.4.2/130-cross-compile.patch
author Daniel Zimmermann <netzimme@gmail.com>
Mon Nov 25 08:56:55 2013 +0100 (2013-11-25)
changeset 3255 4f3536b12be5
parent 1544 2228ea3f6b79
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@1393
     1
diff -durN gcc-4.4.0.orig/gcc/configure gcc-4.4.0/gcc/configure
yann@1393
     2
--- gcc-4.4.0.orig/gcc/configure	2009-03-24 18:46:03.000000000 +0100
yann@1393
     3
+++ gcc-4.4.0/gcc/configure	2009-05-27 21:38:06.000000000 +0200
yann@1393
     4
@@ -13997,7 +13997,7 @@
yann@1393
     5
 	    | powerpc*-*-*,powerpc64*-*-*)
yann@1393
     6
 		CROSS="$CROSS -DNATIVE_CROSS" ;;
yann@1393
     7
 	esac
yann@1393
     8
-elif test "x$TARGET_SYSTEM_ROOT" != x; then
yann@1393
     9
+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
yann@1393
    10
         SYSTEM_HEADER_DIR=$build_system_header_dir
yann@1393
    11
 fi
yann@1393
    12
 
yann@1393
    13
diff -durN gcc-4.4.0.orig/gcc/configure.ac gcc-4.4.0/gcc/configure.ac
yann@1393
    14
--- gcc-4.4.0.orig/gcc/configure.ac	2009-03-24 18:46:03.000000000 +0100
yann@1393
    15
+++ gcc-4.4.0/gcc/configure.ac	2009-05-27 21:38:06.000000000 +0200
yann@1393
    16
@@ -1720,7 +1720,7 @@
yann@1393
    17
 	    | powerpc*-*-*,powerpc64*-*-*)
yann@1393
    18
 		CROSS="$CROSS -DNATIVE_CROSS" ;;
yann@1393
    19
 	esac
yann@1393
    20
-elif test "x$TARGET_SYSTEM_ROOT" != x; then
yann@1393
    21
+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
yann@1393
    22
         SYSTEM_HEADER_DIR=$build_system_header_dir 
yann@1393
    23
 fi
yann@1393
    24
 
yann@1393
    25
diff -durN gcc-4.4.0.orig/gcc/unwind-dw2.c gcc-4.4.0/gcc/unwind-dw2.c
yann@1393
    26
--- gcc-4.4.0.orig/gcc/unwind-dw2.c	2009-04-10 01:23:07.000000000 +0200
yann@1393
    27
+++ gcc-4.4.0/gcc/unwind-dw2.c	2009-05-27 21:38:06.000000000 +0200
yann@1393
    28
@@ -329,9 +329,11 @@
yann@1393
    29
 }
yann@1393
    30
 #endif
yann@1393
    31
 
yann@1393
    32
+#ifndef inhibit_libc
yann@1393
    33
 #ifdef MD_UNWIND_SUPPORT
yann@1393
    34
 #include MD_UNWIND_SUPPORT
yann@1393
    35
 #endif
yann@1393
    36
+#endif
yann@1393
    37
 
yann@1393
    38
 /* Extract any interesting information from the CIE for the translation
yann@1393
    39
    unit F belongs to.  Return a pointer to the byte after the augmentation,