patches/glibc/ports-2.10.1/110-binutils-2.20-compat.patch
author "Bryan Hundven" <bryanhundven@gmail.com>
Thu Mar 01 15:23:49 2012 -0800 (2012-03-01)
changeset 2909 28ac8fbd9e6a
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 
     2 
     3 diff -durN glibc-2.10.1.orig/configure glibc-2.10.1/configure
     4 --- glibc-2.10.1.orig/configure	2009-05-17 14:19:31.000000000 +0200
     5 +++ glibc-2.10.1/configure	2009-11-13 00:49:43.000000000 +0100
     6 @@ -4839,7 +4839,7 @@
     7    ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
     8    case $ac_prog_version in
     9      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
    10 -    2.1[3-9]*)
    11 +    2.1[3-9]*|[2-9].[2-9]*)
    12         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
    13      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
    14  
    15 @@ -4902,7 +4902,7 @@
    16    ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'`
    17    case $ac_prog_version in
    18      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
    19 -    2.1[3-9]*)
    20 +    2.1[3-9]*|[2-9].[2-9]*)
    21         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
    22      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
    23  
    24 diff -durN glibc-2.10.1.orig/configure.in glibc-2.10.1/configure.in
    25 --- glibc-2.10.1.orig/configure.in	2009-04-04 01:51:47.000000000 +0200
    26 +++ glibc-2.10.1/configure.in	2009-11-13 00:49:43.000000000 +0100
    27 @@ -897,10 +897,10 @@
    28  # Accept binutils 2.13 or newer.
    29  AC_CHECK_PROG_VER(AS, $AS, --version,
    30  		  [GNU assembler.* \([0-9]*\.[0-9.]*\)],
    31 -		  [2.1[3-9]*], AS=: critic_missing="$critic_missing as")
    32 +		  [2.1[3-9]*|[2-9].[2-9]*], AS=: critic_missing="$critic_missing as")
    33  AC_CHECK_PROG_VER(LD, $LD, --version,
    34  		  [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)],
    35 -		  [2.1[3-9]*], LD=: critic_missing="$critic_missing ld")
    36 +		  [2.1[3-9]*|[2-9].[2-9]*], LD=: critic_missing="$critic_missing ld")
    37  
    38  # We need the physical current working directory.  We cannot use the
    39  # "pwd -P" shell builtin since that's not portable.  Instead we try to