patches/gcc/3.4.6/180-pr15068-fix.patch
author "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
Thu Jul 28 22:09:31 2011 +0200 (2011-07-28)
changeset 2573 424fa2092ace
parent 339 bd5e0a849352
permissions -rw-r--r--
scripts/libc: do not build add-ons by default

Currently, no --enable-add-ons option is passed to libc configure when
"$(do_libc_add_ons_list ,)" is empty, which makes configure automatically search
for present add-ons. In that case, all present add-ons are built, although
no add-on was selected by the user in the config. Moreover, this can make the
configure fail if some non-standard add-ons like eglibc-localedef are present.

This behavior also leads to an inconsistency from a user point of view between
the following cases:
- LIBC_ADDONS_LIST="", LIBC_GLIBC_USE_PORTS=n and THREADS="none" in the config,
which makes "$(do_libc_add_ons_list ,)" return "", so all present add-ons
are built.
- LIBC_ADDONS_LIST="", LIBC_GLIBC_USE_PORTS=n and THREADS!="none" in the
config, which makes "$(do_libc_add_ons_list ,)" return the add-on supporting
the chosen threading implementation, e.g. "nptl", so only this add-on is
built.

This patch disables the building of all add-ons in that case.

It is still possible to build all present add-ons by adding --enable-add-ons to
LIBC_GLIBC_EXTRA_CONFIG_ARRAY.

Signed-off-by: "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
yann@339
     1
diff -durN gcc-3.4.6.orig/gcc/flow.c gcc-3.4.6/gcc/flow.c
yann@339
     2
--- gcc-3.4.6.orig/gcc/flow.c	2005-09-01 22:51:09.000000000 +0200
yann@339
     3
+++ gcc-3.4.6/gcc/flow.c	2007-08-15 23:00:30.000000000 +0200
yann@339
     4
@@ -1884,6 +1884,7 @@
yann@339
     5
 	  rtx set_src = SET_SRC (pc_set (BB_END (bb)));
yann@339
     6
 	  rtx cond_true = XEXP (set_src, 0);
yann@339
     7
 	  rtx reg = XEXP (cond_true, 0);
yann@339
     8
+ 	  enum rtx_code inv_cond;
yann@339
     9
 
yann@339
    10
 	  if (GET_CODE (reg) == SUBREG)
yann@339
    11
 	    reg = SUBREG_REG (reg);
yann@339
    12
@@ -1892,11 +1893,13 @@
yann@339
    13
 	     in the form of a comparison of a register against zero.  
yann@339
    14
 	     If the condition is more complex than that, then it is safe
yann@339
    15
 	     not to record any information.  */
yann@339
    16
-	  if (GET_CODE (reg) == REG
yann@339
    17
+ 	  inv_cond = reversed_comparison_code (cond_true, BB_END (bb));
yann@339
    18
+ 	  if (inv_cond != UNKNOWN
yann@339
    19
+	      && GET_CODE (reg) == REG
yann@339
    20
 	      && XEXP (cond_true, 1) == const0_rtx)
yann@339
    21
 	    {
yann@339
    22
 	      rtx cond_false
yann@339
    23
-		= gen_rtx_fmt_ee (reverse_condition (GET_CODE (cond_true)),
yann@339
    24
+		= gen_rtx_fmt_ee (inv_cond,
yann@339
    25
 				  GET_MODE (cond_true), XEXP (cond_true, 0),
yann@339
    26
 				  XEXP (cond_true, 1));
yann@339
    27
 	      if (GET_CODE (XEXP (set_src, 1)) == PC)