patches/gcc/4.3.4/330-unwind-for-uClibc.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/330-unwind-for-uClibc.patch
thomas@1461
     2
thomas@1461
     3
-= BEGIN original header =-
thomas@1461
     4
-= END original header =-
thomas@1461
     5
thomas@1461
     6
diff -durN gcc-4.3.3.orig/gcc/config/t-linux-uclibc gcc-4.3.3/gcc/config/t-linux-uclibc
thomas@1461
     7
--- gcc-4.3.3.orig/gcc/config/t-linux-uclibc	1970-01-01 01:00:00.000000000 +0100
thomas@1461
     8
+++ gcc-4.3.3/gcc/config/t-linux-uclibc	2009-01-27 22:28:53.000000000 +0100
thomas@1461
     9
@@ -0,0 +1,5 @@
thomas@1461
    10
+# Remove glibc specific files added in t-linux
thomas@1461
    11
+SHLIB_MAPFILES := $(filter-out $(srcdir)/config/libgcc-glibc.ver, $(SHLIB_MAPFILES))
thomas@1461
    12
+
thomas@1461
    13
+# Use unwind-dw2-fde instead of unwind-dw2-fde-glibc
thomas@1461
    14
+LIB2ADDEH := $(subst unwind-dw2-fde-glibc.c,unwind-dw2-fde.c,$(LIB2ADDEH))
thomas@1461
    15
diff -durN gcc-4.3.3.orig/gcc/config.gcc gcc-4.3.3/gcc/config.gcc
thomas@1461
    16
--- gcc-4.3.3.orig/gcc/config.gcc	2009-01-27 22:25:37.000000000 +0100
thomas@1461
    17
+++ gcc-4.3.3/gcc/config.gcc	2009-01-27 22:28:53.000000000 +0100
thomas@1461
    18
@@ -2648,6 +2648,12 @@
thomas@1461
    19
 	;;
thomas@1461
    20
 esac
thomas@1461
    21
 
thomas@1461
    22
+# Rather than hook into each target, just do it after all the linux
thomas@1461
    23
+# targets have been processed
thomas@1461
    24
+case ${target} in
thomas@1461
    25
+  *-linux-uclibc*) tm_defines="${tm_defines} USE_UCLIBC" ; tmake_file="${tmake_file} t-linux-uclibc";;
thomas@1461
    26
+esac
thomas@1461
    27
+
thomas@1461
    28
 case ${target} in
thomas@1461
    29
 i[34567]86-*-linux*aout* | i[34567]86-*-linux*libc1)
thomas@1461
    30
 	tmake_file="${tmake_file} i386/t-gmm_malloc"