patches/gcc/4.2.0/200-index_macro.patch
author "Bryan Hundven" <bryanhundven@gmail.com>
Thu Mar 01 15:23:49 2012 -0800 (2012-03-01)
changeset 2909 28ac8fbd9e6a
parent 111 2e16b9fc302d
permissions -rw-r--r--
libg/eglibc: add updated eglibc 2.15

Includes a patch to remove __builtin_expect test:

In eglibc-2.15, the build breaks in configure while testing
for the existance of __builtin_expect. It fails with newer
versions of gcc.

This patch is a modification of an upstream change in glibc
mainline (to be 2.16) to fix the following error:

[CFG ] checking for __builtin_expect... no
[ERROR] configure: error: support for __builtin_expect needed

http://sourceware.org/git/?p=glibc.git;a=commit;h=3857022a761ea7251f8e5c0e45d382ebc3e34cf9

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
[yann.morin.1998@free.fr: coalesce both patches into a single changeset]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
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;