Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.5.2/110-libgcc_eh.a.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 
     1 Highly inspired by:

     2   http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch

     3 

     4 diff -durN gcc-4.5.0.orig/libgcc/Makefile.in gcc-4.5.0/libgcc/Makefile.in

     5 --- gcc-4.5.0.orig/libgcc/Makefile.in	2010-03-30 15:08:52.000000000 +0200

     6 +++ gcc-4.5.0/libgcc/Makefile.in	2011-09-12 17:46:51.342800731 +0200

     7 @@ -765,8 +765,9 @@

     8  libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)

     9  endif

    10  

    11 +all: libgcc_eh.a

    12  ifeq ($(enable_shared),yes)

    13 -all: libgcc_eh.a libgcc_s$(SHLIB_EXT)

    14 +all: libgcc_s$(SHLIB_EXT)

    15  ifneq ($(LIBUNWIND),)

    16  all: libunwind$(SHLIB_EXT)

    17  endif

    18 @@ -935,10 +936,6 @@

    19  install-shared:

    20  	$(mkinstalldirs) $(DESTDIR)$(inst_libdir)

    21  

    22 -	$(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/

    23 -	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a

    24 -	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a

    25 -

    26  	$(subst @multilib_dir@,$(MULTIDIR),$(subst \

    27  		@shlib_base_name@,libgcc_s,$(subst \

    28  		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))

    29 @@ -953,6 +950,10 @@

    30  	chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a

    31  	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a

    32  

    33 +	$(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/

    34 +	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a

    35 +	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a

    36 +

    37  	parts="$(INSTALL_PARTS)";				\

    38  	for file in $$parts; do					\

    39  	  rm -f $(DESTDIR)$(inst_libdir)/$$file;		\
crosstool-ng