patches/gcc/4.2.1/200-index_macro.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Thu Dec 27 12:45:22 2012 +0100 (2012-12-27)
changeset 3152 b286c7993be5
parent 313 2f223aafc7cb
permissions -rw-r--r--
scripts/addToolsVersion: properly handle .in vs. .in.2

While most components have their version in the .in file, some
have it in the .in.2 (eg. elf2flt).

Currently, to handle this case, we indiscriminately munge both files,
but this is wrong: in the elf2flt case, if we add a binutils version,
we do not want it to be added to elf2flt, and conversely.

So, for each tool, we need to explicitly know what file to munge.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
     1 diff -durN gcc-4.2.1.orig/libstdc++-v3/include/ext/rope gcc-4.2.1/libstdc++-v3/include/ext/rope
     2 --- gcc-4.2.1.orig/libstdc++-v3/include/ext/rope	2006-10-17 13:56:21.000000000 +0200
     3 +++ gcc-4.2.1/libstdc++-v3/include/ext/rope	2007-08-03 20:34:23.000000000 +0200
     4 @@ -58,6 +58,9 @@
     5  #include <bits/allocator.h>
     6  #include <ext/hash_fun.h>
     7  
     8 +/* cope w/ index defined as macro, SuSv3 proposal */
     9 +#undef index
    10 +
    11  # ifdef __GC
    12  #   define __GC_CONST const
    13  # else
    14 diff -durN gcc-4.2.1.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.2.1/libstdc++-v3/include/ext/ropeimpl.h
    15 --- gcc-4.2.1.orig/libstdc++-v3/include/ext/ropeimpl.h	2006-10-17 13:56:21.000000000 +0200
    16 +++ gcc-4.2.1/libstdc++-v3/include/ext/ropeimpl.h	2007-08-03 20:34:23.000000000 +0200
    17 @@ -54,6 +54,9 @@
    18  #include <ext/memory> // For uninitialized_copy_n
    19  #include <ext/numeric> // For power
    20  
    21 +/* cope w/ index defined as macro, SuSv3 proposal */
    22 +#undef index
    23 +
    24  _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
    25  
    26    using std::size_t;