Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.3.1/290-index_macro.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:06:16 2011 +0200 (2011-05-19)
changeset 2461 ec30b191f0e3
permissions -rw-r--r--
complibs/ppl: build only C and C++ interfaces for PPL

By default, PPL wants to build interfaces for any of a variety of
langauges it finds on the local host (python, java, possibly perl, also
more esoteric languages such as ocaml and prolog).

These extra interfaces can double the compile time for the library. For
single-process builds, I found a savings of more than 40%:

default / j1: 716s total, 143.2s avg, 0.52s stdev
just_c / j1: 406s total, 81.2s avg, 0.33s stdev
just_c_cpp / j1: 413s total, 82.6s avg, 0.22s stdev

And for multi-process builds, it approached 50%:

default / j4: 625s total, 125.0s avg, 0.57s stdev
just_c / j4: 338s total, 67.6s avg, 1.25s stdev
just_c_cpp / j4: 327s total, 65.4s avg, 0.36s stdev

Since the PPL we build within ct-ng is only used by GCC, we only need to
build the C and C++ interfaces.

Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com>
yann@757 
     1
 
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
yann@757 
     2
 
diff -durN gcc-4.3.1.orig/libstdc++-v3/include/ext/rope gcc-4.3.1/libstdc++-v3/include/ext/rope
yann@757 
     3
 
--- gcc-4.3.1.orig/libstdc++-v3/include/ext/rope	2008-01-31 19:44:55.000000000 +0100
yann@757 
     4
 
+++ gcc-4.3.1/libstdc++-v3/include/ext/rope	2008-06-10 14:59:02.000000000 +0200
yann@757 
     5
 
@@ -59,6 +59,9 @@
yann@757 
     6
 
 #include <bits/gthr.h>
yann@757 
     7
 
 #include <tr1/functional>
yann@757 
     8
yann@757 
     9
 
+/* cope w/ index defined as macro, SuSv3 proposal */
yann@757 
    10
 
+#undef index
yann@757 
    11
 
+
yann@757 
    12
 
 # ifdef __GC
yann@757 
    13
 
 #   define __GC_CONST const
yann@757 
    14
 
 # else
yann@757 
    15
 
diff -durN gcc-4.3.1.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.3.1/libstdc++-v3/include/ext/ropeimpl.h
yann@757 
    16
 
--- gcc-4.3.1.orig/libstdc++-v3/include/ext/ropeimpl.h	2007-05-04 17:06:46.000000000 +0200
yann@757 
    17
 
+++ gcc-4.3.1/libstdc++-v3/include/ext/ropeimpl.h	2008-06-10 14:59:02.000000000 +0200
yann@757 
    18
 
@@ -54,6 +54,9 @@
yann@757 
    19
 
 #include <ext/memory> // For uninitialized_copy_n
yann@757 
    20
 
 #include <ext/numeric> // For power
yann@757 
    21
yann@757 
    22
 
+/* cope w/ index defined as macro, SuSv3 proposal */
yann@757 
    23
 
+#undef index
yann@757 
    24
 
+
yann@757 
    25
 
 _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
yann@757 
    26
yann@757 
    27
 
   using std::size_t;
crosstool-ng