patches/gcc/4.3.0/800-304-index_macro.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Jun 30 21:41:32 2008 +0000 (2008-06-30)
changeset 636 92f2e82084cd
permissions -rw-r--r--
Update samples to the latest architecture framework.

/trunk/samples/armeb-unknown-linux-uclibc/crosstool.config | 57 32 25 0 +++++++-----
/trunk/samples/arm-unknown-linux-gnueabi/crosstool.config | 60 34 26 0 +++++++------
/trunk/samples/mips-unknown-linux-uclibc/crosstool.config | 43 23 20 0 +++++----
/trunk/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config | 57 32 25 0 +++++++-----
/trunk/samples/ia64-unknown-linux-gnu/crosstool.config | 46 26 20 0 ++++++----
/trunk/samples/armeb-unknown-linux-gnu/crosstool.config | 56 30 26 0 ++++++------
/trunk/samples/x86_64-unknown-linux-uclibc/crosstool.config | 43 23 20 0 +++++----
/trunk/samples/arm-unknown-linux-uclibc/crosstool.config | 53 27 26 0 ++++++-----
/trunk/samples/i586-geode-linux-uclibc/crosstool.config | 43 23 20 0 +++++----
/trunk/samples/powerpc-unknown-linux-uclibc/crosstool.config | 49 29 20 0 ++++++-----
/trunk/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config | 51 26 25 0 ++++++-----
/trunk/samples/i686-nptl-linux-gnu/crosstool.config | 43 23 20 0 +++++----
/trunk/samples/alphaev56-unknown-linux-gnu/crosstool.config | 44 21 23 0 ++++------
13 files changed, 349 insertions(+), 296 deletions(-)
yann@552
     1
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.0/uclibc/90_all_304-index_macro.patch
yann@552
     2
diff -durN gcc-4.3.0.orig/libstdc++-v3/include/ext/rope gcc-4.3.0/libstdc++-v3/include/ext/rope
yann@552
     3
--- gcc-4.3.0.orig/libstdc++-v3/include/ext/rope	2008-01-31 19:44:55.000000000 +0100
yann@552
     4
+++ gcc-4.3.0/libstdc++-v3/include/ext/rope	2008-06-10 14:45:58.000000000 +0200
yann@552
     5
@@ -59,6 +59,9 @@
yann@552
     6
 #include <bits/gthr.h>
yann@552
     7
 #include <tr1/functional>
yann@552
     8
 
yann@552
     9
+/* cope w/ index defined as macro, SuSv3 proposal */
yann@552
    10
+#undef index
yann@552
    11
+
yann@552
    12
 # ifdef __GC
yann@552
    13
 #   define __GC_CONST const
yann@552
    14
 # else
yann@552
    15
diff -durN gcc-4.3.0.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.3.0/libstdc++-v3/include/ext/ropeimpl.h
yann@552
    16
--- gcc-4.3.0.orig/libstdc++-v3/include/ext/ropeimpl.h	2007-05-04 17:06:46.000000000 +0200
yann@552
    17
+++ gcc-4.3.0/libstdc++-v3/include/ext/ropeimpl.h	2008-06-10 14:45:58.000000000 +0200
yann@552
    18
@@ -54,6 +54,9 @@
yann@552
    19
 #include <ext/memory> // For uninitialized_copy_n
yann@552
    20
 #include <ext/numeric> // For power
yann@552
    21
 
yann@552
    22
+/* cope w/ index defined as macro, SuSv3 proposal */
yann@552
    23
+#undef index
yann@552
    24
+
yann@552
    25
 _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
yann@552
    26
 
yann@552
    27
   using std::size_t;