patches/gcc/4.3.5/160-flatten-switch-stmt-00.patch
author "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
Wed Dec 14 16:55:22 2011 +0100 (2011-12-14)
branch1.13
changeset 2848 1ff89596dab0
parent 1461 35b30f8fb307
permissions -rw-r--r--
libc/eglibc: fix localedef 2.14 build

The localedef of eglibc 2.14 requires NOT_IN_libc to be defined in order to
compile intl/l10nflist.c.

This is because localedef is built separately from eglibc and uses some parts of
eglibc that don't compile in standalone without this preprocessor definition.

This fixes the following error:

[ALL ] gcc -g -O2 -DNO_SYSCONF -DNO_UNCOMPRESS
-DLOCALE_PATH='"/usr/lib/locale:/usr/share/i18n"'
-DLOCALEDIR='"/usr/lib/locale"' -DLOCALE_ALIAS_PATH='"/usr/share/locale"'
-DCHARMAP_PATH='"/usr/share/i18n/charmaps"'
-DREPERTOIREMAP_PATH='"/usr/share/i18n/repertoiremaps"'
-DLOCSRCDIR='"/usr/share/i18n/locales"' -Iglibc/locale/programs -Iglibc/locale
-I/<snip>/.build/src/eglibc-localedef-2_14/include
-I/<snip>/.build/src/eglibc-localedef-2_14 -I.
-include /<snip>/.build/src/eglibc-localedef-2_14/include/always.h -Wall
-Wno-format -c -o locarchive.o glibc/locale/programs/locarchive.c
[ALL ] glibc/locale/programs/locarchive.c: In function 'enlarge_archive':
[ALL ] glibc/locale/programs/locarchive.c:303:21: warning: variable
'oldlocrectab' set but not used [-Wunused-but-set-variable]
[ALL ] In file included from glibc/locale/programs/locarchive.c:651:0:
[ALL ] glibc/locale/programs/../../intl/l10nflist.c: In function
'_nl_normalize_codeset':
[ERROR] glibc/locale/programs/../../intl/l10nflist.c:342:9: error:
'_nl_C_locobj_ptr' undeclared (first use in this function)
[ALL ] glibc/locale/programs/../../intl/l10nflist.c:342:9: note: each
undeclared identifier is reported only once for each function it appears in
[ALL ] glibc/locale/programs/locarchive.c: In function
'add_locales_to_archive':
[ALL ] glibc/locale/programs/locarchive.c:1450:7: warning: passing argument
1 of '__xpg_basename' discards 'const' qualifier from pointer target type
[enabled by default]
[ALL ] /usr/include/libgen.h:35:14: note: expected 'char *' but argument is
of type 'const char *'
[ERROR] make[1]: *** [locarchive.o] Error 1

Signed-off-by: "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
(transplanted from 4cd9134739b594451794cf61a6e1b137422cdafd)
     1 Original patch from: ../4.3.2/160-flatten-switch-stmt-00.patch
     2 
     3 -= BEGIN original header =-
     4 Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/18_all_904-flatten-switch-stmt-00.patch
     5 http://gcc.gnu.org/ml/gcc-patches/2007-04/msg00927.html
     6 
     7 Hi,
     8 
     9 The attached patch makes sure that we create smaller object code for
    10 simple switch statements. We just make sure to flatten the switch
    11 statement into an if-else chain, basically.
    12 
    13 This fixes a size-regression as compared to gcc-3.4, as can be seen
    14 below.
    15 
    16 2007-04-15  Bernhard Fischer  <..>
    17 
    18 	* stmt.c (expand_case): Do not create a complex binary tree when
    19 	optimizing for size but rather use the simple ordered list.
    20 	(emit_case_nodes): do not emit jumps to the default_label when
    21 	optimizing for size.
    22 
    23 Not regtested so far.
    24 Comments?
    25 
    26 Attached is the test switch.c mentioned below.
    27 
    28 $ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do
    29 gcc-$i  -DCHAIN -Os -o switch-CHAIN-$i.o -c switch.c ;done
    30 $ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do
    31 gcc-$i  -UCHAIN -Os -o switch-$i.o -c switch.c ;done
    32 
    33 $ size switch-*.o
    34    text	   data	    bss	    dec	    hex	filename
    35     169	      0	      0	    169	     a9	switch-2.95.o
    36     115	      0	      0	    115	     73	switch-3.3.o
    37     103	      0	      0	    103	     67	switch-3.4.o
    38     124	      0	      0	    124	     7c	switch-4.0.o
    39     124	      0	      0	    124	     7c	switch-4.1.o
    40     124	      0	      0	    124	     7c	switch-4.2.orig-HEAD.o
    41      95	      0	      0	     95	     5f	switch-4.3-HEAD.o
    42     124	      0	      0	    124	     7c	switch-4.3.orig-HEAD.o
    43     166	      0	      0	    166	     a6	switch-CHAIN-2.95.o
    44     111	      0	      0	    111	     6f	switch-CHAIN-3.3.o
    45      95	      0	      0	     95	     5f	switch-CHAIN-3.4.o
    46      95	      0	      0	     95	     5f	switch-CHAIN-4.0.o
    47      95	      0	      0	     95	     5f	switch-CHAIN-4.1.o
    48      95	      0	      0	     95	     5f	switch-CHAIN-4.2.orig-HEAD.o
    49      95	      0	      0	     95	     5f	switch-CHAIN-4.3-HEAD.o
    50      95	      0	      0	     95	     5f	switch-CHAIN-4.3.orig-HEAD.o
    51 
    52 
    53 Content-Type: text/x-diff; charset=us-ascii
    54 Content-Disposition: attachment; filename="gcc-4.3.gcc-flatten-switch-stmt.00.diff"
    55 
    56 -= END original header =-
    57 
    58 diff -durN gcc-4.3.3.orig/gcc/stmt.c gcc-4.3.3/gcc/stmt.c
    59 --- gcc-4.3.3.orig/gcc/stmt.c	2008-05-09 20:12:13.000000000 +0200
    60 +++ gcc-4.3.3/gcc/stmt.c	2009-01-27 22:19:28.000000000 +0100
    61 @@ -2509,7 +2509,11 @@
    62  	  use_cost_table
    63  	    = (TREE_CODE (orig_type) != ENUMERAL_TYPE
    64  	       && estimate_case_costs (case_list));
    65 -	  balance_case_nodes (&case_list, NULL);
    66 +	  /* When optimizing for size, we want a straight list to avoid
    67 +	     jumps as much as possible. This basically creates an if-else
    68 +	     chain.  */
    69 +	  if (!optimize_size)
    70 +	    balance_case_nodes (&case_list, NULL);
    71  	  emit_case_nodes (index, case_list, default_label, index_type);
    72  	  emit_jump (default_label);
    73  	}
    74 @@ -3067,6 +3071,7 @@
    75  	    {
    76  	      if (!node_has_low_bound (node, index_type))
    77  		{
    78 +		  if (!optimize_size) /* don't jl to the .default_label. */
    79  		  emit_cmp_and_jump_insns (index,
    80  					   convert_modes
    81  					   (mode, imode,