Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/3.4.6/180-pr15068-fix.patch
author "Bryan Hundven" <bryanhundven@gmail.com>
Thu Mar 01 15:23:49 2012 -0800 (2012-03-01)
changeset 2909 28ac8fbd9e6a
parent 339 bd5e0a849352
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 diff -durN gcc-3.4.6.orig/gcc/flow.c gcc-3.4.6/gcc/flow.c

     2 --- gcc-3.4.6.orig/gcc/flow.c	2005-09-01 22:51:09.000000000 +0200

     3 +++ gcc-3.4.6/gcc/flow.c	2007-08-15 23:00:30.000000000 +0200

     4 @@ -1884,6 +1884,7 @@

     5  	  rtx set_src = SET_SRC (pc_set (BB_END (bb)));

     6  	  rtx cond_true = XEXP (set_src, 0);

     7  	  rtx reg = XEXP (cond_true, 0);

     8 + 	  enum rtx_code inv_cond;

     9  

    10  	  if (GET_CODE (reg) == SUBREG)

    11  	    reg = SUBREG_REG (reg);

    12 @@ -1892,11 +1893,13 @@

    13  	     in the form of a comparison of a register against zero.  

    14  	     If the condition is more complex than that, then it is safe

    15  	     not to record any information.  */

    16 -	  if (GET_CODE (reg) == REG

    17 + 	  inv_cond = reversed_comparison_code (cond_true, BB_END (bb));

    18 + 	  if (inv_cond != UNKNOWN

    19 +	      && GET_CODE (reg) == REG

    20  	      && XEXP (cond_true, 1) == const0_rtx)

    21  	    {

    22  	      rtx cond_false

    23 -		= gen_rtx_fmt_ee (reverse_condition (GET_CODE (cond_true)),

    24 +		= gen_rtx_fmt_ee (inv_cond,

    25  				  GET_MODE (cond_true), XEXP (cond_true, 0),

    26  				  XEXP (cond_true, 1));

    27  	      if (GET_CODE (XEXP (set_src, 1)) == PC)
crosstool-ng