patches/gcc/4.4.3/350-index_macro.patch
author "Bryan Hundven" <bryanhundven@gmail.com>
Thu Mar 01 15:23:49 2012 -0800 (2012-03-01)
changeset 2909 28ac8fbd9e6a
parent 1676 6f836ab1b317
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>
     1 Original patch from: ../4.3.2/290-index_macro.patch
     2 
     3 -= BEGIN original header =-
     4 Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
     5 -= END original header =-
     6 
     7 diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/rope gcc-4.3.3/libstdc++-v3/include/ext/rope
     8 --- gcc-4.3.3.orig/libstdc++-v3/include/ext/rope	2008-07-15 12:14:51.000000000 +0200
     9 +++ gcc-4.3.3/libstdc++-v3/include/ext/rope	2009-01-27 22:25:41.000000000 +0100
    10 @@ -59,6 +59,9 @@
    11  #include <bits/gthr.h>
    12  #include <tr1/functional>
    13  
    14 +/* cope w/ index defined as macro, SuSv3 proposal */
    15 +#undef index
    16 +
    17  # ifdef __GC
    18  #   define __GC_CONST const
    19  # else
    20 diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h
    21 --- gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h	2007-05-04 17:06:46.000000000 +0200
    22 +++ gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h	2009-01-27 22:25:41.000000000 +0100
    23 @@ -54,6 +54,9 @@
    24  #include <ext/memory> // For uninitialized_copy_n
    25  #include <ext/numeric> // For power
    26  
    27 +/* cope w/ index defined as macro, SuSv3 proposal */
    28 +#undef index
    29 +
    30  _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
    31  
    32    using std::size_t;