patches/gcc/4.4.1/190-flatten-switch-stmt-00.patch
author Zoltan Devai <zdevai@gmail.com>
Wed Oct 28 12:03:38 2009 +0100 (2009-10-28)
changeset 1602 1ba79f2126df
parent 1393 b432bd628b10
permissions -rw-r--r--
libc/uClibc: fix building on system with recent glibc

While trying to build a toolchain with ct-ng 1.5.0,
arm-unknown-linux-uclibcgnueabi target,
I get the following error:

[INFO ] Installing C library headers
[EXTRA] Copying sources to build dir
[EXTRA] Applying configuration
[EXTRA] Building headers
[EXTRA] Installing headers
[ERROR] extra/scripts/unifdef.c:209: error: conflicting types for 'getline'
[ERROR] make[2]: *** [extra/scripts/unifdef] Error 1
[ERROR] Build failed in step 'Installing C library headers'

The following patch solves the problem.
(It's a backport of this uClibc commit:
http://git.uclibc.org/uClibc/commit/?id=49e81cada73616864b9b31df0aeb6961c30f5a6e
)

[--SNIP from another mail--]
AFAIK this is a problem since glibc 2.10.
     1 diff -durN gcc-4.4.0.orig/gcc/stmt.c gcc-4.4.0/gcc/stmt.c
     2 --- gcc-4.4.0.orig/gcc/stmt.c	2009-02-27 20:49:42.000000000 +0100
     3 +++ gcc-4.4.0/gcc/stmt.c	2009-05-27 21:38:21.000000000 +0200
     4 @@ -2376,7 +2376,11 @@
     5  	  use_cost_table
     6  	    = (TREE_CODE (orig_type) != ENUMERAL_TYPE
     7  	       && estimate_case_costs (case_list));
     8 -	  balance_case_nodes (&case_list, NULL);
     9 +	  /* When optimizing for size, we want a straight list to avoid
    10 +	     jumps as much as possible. This basically creates an if-else
    11 +	     chain.  */
    12 +	  if (!optimize_size)
    13 +	    balance_case_nodes (&case_list, NULL);
    14  	  emit_case_nodes (index, case_list, default_label, index_type);
    15  	  if (default_label)
    16  	    emit_jump (default_label);
    17 @@ -2942,6 +2946,7 @@
    18  	    {
    19  	      if (!node_has_low_bound (node, index_type))
    20  		{
    21 +		  if (!optimize_size) /* don't jl to the .default_label. */
    22  		  emit_cmp_and_jump_insns (index,
    23  					   convert_modes
    24  					   (mode, imode,