patches/gcc/4.4.2/350-index_macro.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sat Dec 31 18:47:37 2011 +0100 (2011-12-31)
changeset 2829 0c3c95f911ec
parent 1461 35b30f8fb307
permissions -rw-r--r--
docs: credit Konrad EISELE for the initial multilib support

Konrad submitted an initial patch adding multlib support:
http://sourceware.org/ml/crossgcc/2011-11/msg00040.html

The patch was full of good ideas, but had a few issues, so
I (Yann E. MORIN) started it all from scatch, re-using part
of the original patch. This got implemented in this series:
hg log -r 446a17b5dd1e:e47d17391ae3

As I forgot to credit Konrad in these changelogs, update the
docs so that the work by Konrad gets credited. Without his
initial effort, we would probably not have had multlib support
so soon. Thank you Konrad!

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.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;