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