Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.4.3/350-index_macro.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Mar 28 01:05:18 2011 +0200 (2011-03-28)
changeset 2362 0888065f8c4d
parent 1676 6f836ab1b317
permissions -rw-r--r--
cc/gcc: cleanup the _or_later logic

So far, we've had a version always select appropriate _or_later option,
which in turn would select all previous _or_later options.

Because the dependencies on companion libs were cumulative, that was
working OK. But the upcoming 4.6 will no longer depend on libelf, so
we can't keep the cumulative scheme we've been using so far.

Have each release family select the corresponding dependencies, instead
of relying on selecting previous _or_later.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 
     1 Original patch from: ../4.3.2/290-index_macro.patch

     2 

     3 -= BEGIN original header =-

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

     5 -= END original header =-

     6 

     7 diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/rope gcc-4.3.3/libstdc++-v3/include/ext/rope

     8 --- gcc-4.3.3.orig/libstdc++-v3/include/ext/rope	2008-07-15 12:14:51.000000000 +0200

     9 +++ gcc-4.3.3/libstdc++-v3/include/ext/rope	2009-01-27 22:25:41.000000000 +0100

    10 @@ -59,6 +59,9 @@

    11  #include <bits/gthr.h>

    12  #include <tr1/functional>

    13  

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

    15 +#undef index

    16 +

    17  # ifdef __GC

    18  #   define __GC_CONST const

    19  # else

    20 diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h

    21 --- gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h	2007-05-04 17:06:46.000000000 +0200

    22 +++ gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h	2009-01-27 22:25:41.000000000 +0100

    23 @@ -54,6 +54,9 @@

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

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

    26  

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

    28 +#undef index

    29 +

    30  _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)

    31  

    32    using std::size_t;
crosstool-ng