patches/gcc/4.2.0/200-index_macro.patch
author Johannes Stezenbach <js@sig21.net>
Thu Jul 29 19:47:16 2010 +0200 (2010-07-29)
changeset 2045 fdaa6c7f6dea
parent 111 2e16b9fc302d
permissions -rw-r--r--
cc/gcc: add option to compile against static libstdc++, for gcc-4.4 and newer

Idea and know-how taken from CodeSourcery build script.

Normal build:
$ ldd arm-unknown-linux-uclibcgnueabi-gcc
linux-gate.so.1 => (0xb77f3000)
libstdc++.so.6 => /usr/lib/libstdc++.so.6 (0xb76e8000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb75a1000)
libm.so.6 => /lib/i686/cmov/libm.so.6 (0xb757a000)
/lib/ld-linux.so.2 (0xb77f4000)
libgcc_s.so.1 => /lib/libgcc_s.so.1 (0xb755c000)

CC_STATIC_LIBSTDCXX=y:
$ ldd arm-unknown-linux-uclibcgnueabi-gcc
linux-gate.so.1 => (0xb7843000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb76e6000)
/lib/ld-linux.so.2 (0xb7844000)

I made CC_STATIC_LIBSTDCXX default=y since I think
it is always desirable.

Signed-off-by: Johannes Stezenbach <js@sig21.net>
yann@111
     1
--- gcc-4.1.0/libstdc++-v3/include/ext/rope.mps	2006-03-24 01:49:51 +0100
yann@111
     2
+++ gcc-4.1.0/libstdc++-v3/include/ext/rope	2006-03-24 01:49:37 +0100
yann@111
     3
@@ -59,6 +59,9 @@
yann@111
     4
 #include <bits/allocator.h>
yann@111
     5
 #include <ext/hash_fun.h>
yann@111
     6
 
yann@111
     7
+/* cope w/ index defined as macro, SuSv3 proposal */
yann@111
     8
+#undef index
yann@111
     9
+
yann@111
    10
 # ifdef __GC
yann@111
    11
 #   define __GC_CONST const
yann@111
    12
 # else
yann@111
    13
--- gcc-4.1.0/libstdc++-v3/include/ext/ropeimpl.h.mps	2006-03-24 01:50:04 +0100
yann@111
    14
+++ gcc-4.1.0/libstdc++-v3/include/ext/ropeimpl.h	2006-03-24 01:50:28 +0100
yann@111
    15
@@ -53,6 +53,9 @@
yann@111
    16
 #include <ext/memory> // For uninitialized_copy_n
yann@111
    17
 #include <ext/numeric> // For power
yann@111
    18
 
yann@111
    19
+/* cope w/ index defined as macro, SuSv3 proposal */
yann@111
    20
+#undef index
yann@111
    21
+
yann@111
    22
 _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
yann@111
    23
yann@111
    24
   using std::size_t;