Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.2.0/220-libstdc++-namespace.patch
author Daniel Zimmermann <netzimme@gmail.com>
Mon Nov 25 08:56:55 2013 +0100 (2013-11-25)
changeset 3255 4f3536b12be5
parent 111 2e16b9fc302d
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 diff -rup gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2/libstdc++-v3/config/locale/uclibc/messages_members.h

     2 --- gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/messages_members.h	2006-12-22 13:06:56.000000000 +0100

     3 +++ gcc-4.2/libstdc++-v3/config/locale/uclibc/messages_members.h	2006-12-22 15:23:41.000000000 +0100

     4 @@ -32,7 +32,8 @@

     5  //

     6  

     7  // Written by Benjamin Kosnik <bkoz@redhat.com>

     8 -

     9 +namespace std

    10 +{

    11  #ifdef __UCLIBC_MJN3_ONLY__

    12  #warning fix prototypes for *textdomain funcs

    13  #endif

    14 @@ -115,3 +116,4 @@

    15  	   this->_S_create_c_locale(this->_M_c_locale_messages, __s); 

    16  	 }

    17       }

    18 +}

    19 diff -rup gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.2/libstdc++-v3/config/locale/uclibc/time_members.h

    20 --- gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/time_members.h	2006-12-22 13:06:56.000000000 +0100

    21 +++ gcc-4.2/libstdc++-v3/config/locale/uclibc/time_members.h	2006-12-22 15:20:31.000000000 +0100

    22 @@ -33,7 +33,8 @@

    23  //

    24  

    25  // Written by Benjamin Kosnik <bkoz@redhat.com>

    26 -

    27 +namespace std

    28 +{

    29    template<typename _CharT>

    30      __timepunct<_CharT>::__timepunct(size_t __refs) 

    31      : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), 

    32 @@ -74,3 +75,4 @@

    33        delete _M_data; 

    34        _S_destroy_c_locale(_M_c_locale_timepunct); 

    35      }

    36 +}
crosstool-ng