Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.4.4/350-index_macro.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Wed Dec 05 20:31:43 2012 +0100 (2012-12-05)
changeset 3134 863723936e24
parent 1948 d341be24dc68
permissions -rw-r--r--
scripts/xldd: use user's sed and grep

xldd uses sed and grep as detected by ./configure. This works well if is
used on the machine that build the toolchain.

But if the user moves the toolchain to another machine where sed and grep
are not in the same directory (eg. /bin/sed vs. /usr/bin/sed), then xldd
will stop functionning.

Fix that by using ${SED} and ${GREP} if they are set in the environment.

Reported-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> 
     1 -= BEGIN original header =-

     2 Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch

     3 -= END original header =-

     4 

     5 diff -durN gcc-4.4.4.orig/libstdc++-v3/include/ext/rope gcc-4.4.4/libstdc++-v3/include/ext/rope

     6 --- gcc-4.4.4.orig/libstdc++-v3/include/ext/rope	2009-04-10 01:23:07.000000000 +0200

     7 +++ gcc-4.4.4/libstdc++-v3/include/ext/rope	2010-05-16 19:37:47.000000000 +0200

     8 @@ -54,6 +54,9 @@

     9  #include <bits/gthr.h>

    10  #include <tr1/functional>

    11  

    12 +/* cope w/ index defined as macro, SuSv3 proposal */

    13 +#undef index

    14 +

    15  # ifdef __GC

    16  #   define __GC_CONST const

    17  # else

    18 diff -durN gcc-4.4.4.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.4.4/libstdc++-v3/include/ext/ropeimpl.h

    19 --- gcc-4.4.4.orig/libstdc++-v3/include/ext/ropeimpl.h	2009-04-10 01:23:07.000000000 +0200

    20 +++ gcc-4.4.4/libstdc++-v3/include/ext/ropeimpl.h	2010-05-16 19:37:47.000000000 +0200

    21 @@ -49,6 +49,9 @@

    22  #include <ext/memory> // For uninitialized_copy_n

    23  #include <ext/numeric> // For power

    24  

    25 +/* cope w/ index defined as macro, SuSv3 proposal */

    26 +#undef index

    27 +

    28  _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)

    29  

    30    using std::size_t;
crosstool-ng