patches/gcc/4.4.4/190-flatten-switch-stmt-00.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:09:43 2011 +0200 (2011-05-19)
branch1.11
changeset 2465 5f98b7a90fbc
parent 1948 d341be24dc68
permissions -rw-r--r--
complibs/ppl: fix 0.11-0.11.2 to compile with --disable-shared

PPL 0.11 (through 0.11.2) had a small bug where it still tried to build
and test its Java interface even when shared libraries are disabled.
Since that's exactly what ct-ng does, it explodes.

This is the patch from the PPL authors (see final link below).

More information can be found in these messages/threads:

Anthony's initial report and analysis with Yann:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00046.html

Ron Flory hit the same problem:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00054.html

Anthony's report to the ppl-devel list:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017450.html

Roberto's reply with a link to the fix in the PPL git repo:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017455.html

Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com>
(transplanted from 139b85d70b623e51f7585e7c64ecb8c6a6cf4567)
yann@1948
     1
diff -durN gcc-4.4.4.orig/gcc/stmt.c gcc-4.4.4/gcc/stmt.c
yann@1948
     2
--- gcc-4.4.4.orig/gcc/stmt.c	2010-03-08 12:46:28.000000000 +0100
yann@1948
     3
+++ gcc-4.4.4/gcc/stmt.c	2010-05-16 19:12:31.000000000 +0200
yann@1948
     4
@@ -2377,7 +2377,11 @@
yann@1948
     5
 	  use_cost_table
yann@1948
     6
 	    = (TREE_CODE (orig_type) != ENUMERAL_TYPE
yann@1948
     7
 	       && estimate_case_costs (case_list));
yann@1948
     8
-	  balance_case_nodes (&case_list, NULL);
yann@1948
     9
+	  /* When optimizing for size, we want a straight list to avoid
yann@1948
    10
+	     jumps as much as possible. This basically creates an if-else
yann@1948
    11
+	     chain.  */
yann@1948
    12
+	  if (!optimize_size)
yann@1948
    13
+	    balance_case_nodes (&case_list, NULL);
yann@1948
    14
 	  emit_case_nodes (index, case_list, default_label, index_type);
yann@1948
    15
 	  if (default_label)
yann@1948
    16
 	    emit_jump (default_label);
yann@1948
    17
@@ -2943,6 +2947,7 @@
yann@1948
    18
 	    {
yann@1948
    19
 	      if (!node_has_low_bound (node, index_type))
yann@1948
    20
 		{
yann@1948
    21
+		  if (!optimize_size) /* don't jl to the .default_label. */
yann@1948
    22
 		  emit_cmp_and_jump_insns (index,
yann@1948
    23
 					   convert_modes
yann@1948
    24
 					   (mode, imode,