patches/gcc/4.4.1/350-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 1461 35b30f8fb307
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>
thomas@1461
     1
Original patch from: ../4.3.2/290-index_macro.patch
thomas@1461
     2
thomas@1461
     3
-= BEGIN original header =-
thomas@1461
     4
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
thomas@1461
     5
-= END original header =-
thomas@1461
     6
thomas@1461
     7
diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/rope gcc-4.3.3/libstdc++-v3/include/ext/rope
thomas@1461
     8
--- gcc-4.3.3.orig/libstdc++-v3/include/ext/rope	2008-07-15 12:14:51.000000000 +0200
thomas@1461
     9
+++ gcc-4.3.3/libstdc++-v3/include/ext/rope	2009-01-27 22:25:41.000000000 +0100
thomas@1461
    10
@@ -59,6 +59,9 @@
thomas@1461
    11
 #include <bits/gthr.h>
thomas@1461
    12
 #include <tr1/functional>
thomas@1461
    13
 
thomas@1461
    14
+/* cope w/ index defined as macro, SuSv3 proposal */
thomas@1461
    15
+#undef index
thomas@1461
    16
+
thomas@1461
    17
 # ifdef __GC
thomas@1461
    18
 #   define __GC_CONST const
thomas@1461
    19
 # else
thomas@1461
    20
diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h
thomas@1461
    21
--- gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h	2007-05-04 17:06:46.000000000 +0200
thomas@1461
    22
+++ gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h	2009-01-27 22:25:41.000000000 +0100
thomas@1461
    23
@@ -54,6 +54,9 @@
thomas@1461
    24
 #include <ext/memory> // For uninitialized_copy_n
thomas@1461
    25
 #include <ext/numeric> // For power
thomas@1461
    26
 
thomas@1461
    27
+/* cope w/ index defined as macro, SuSv3 proposal */
thomas@1461
    28
+#undef index
thomas@1461
    29
+
thomas@1461
    30
 _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
thomas@1461
    31
 
thomas@1461
    32
   using std::size_t;