patches/gcc/4.4.6/340-ecjx-host-cc.patch
author Daniel Zimmermann <netzimme@gmail.com>
Mon Nov 25 08:56:55 2013 +0100 (2013-11-25)
changeset 3255 4f3536b12be5
parent 2149 98b7806295cc
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/libjava/Makefile.in gcc-4.4.5/libjava/Makefile.in
yann@2149
     2
--- gcc-4.4.5.orig/libjava/Makefile.in	2010-10-01 10:26:18.000000000 +0200
yann@2149
     3
+++ gcc-4.4.5/libjava/Makefile.in	2010-10-09 23:12:22.000000000 +0200
yann@2149
     4
@@ -9180,6 +9180,9 @@
yann@2149
     5
 ecjx$(EXEEXT): $(ecjx_OBJECTS) $(ecjx_DEPENDENCIES) 
yann@2149
     6
 	@rm -f ecjx$(EXEEXT)
yann@2149
     7
 	$(ecjx_LINK) $(ecjx_LDFLAGS) $(ecjx_OBJECTS) $(ecjx_LDADD) $(LIBS)
yann@2149
     8
+ecjx.$(OBJEXT): $(ecjx_SOURCES)
yann@2149
     9
+	@rm -f ecjx.$(OBJEXT)
yann@2149
    10
+	$(CC_FOR_BUILD) $(BUILD_CFLAGS) -c -o $@ $<
yann@2149
    11
 gappletviewer$(EXEEXT): $(gappletviewer_OBJECTS) $(gappletviewer_DEPENDENCIES) 
yann@2149
    12
 	@rm -f gappletviewer$(EXEEXT)
yann@2149
    13
 	$(gappletviewer_LINK) $(gappletviewer_LDFLAGS) $(gappletviewer_OBJECTS) $(gappletviewer_LDADD) $(LIBS)