patches/gcc/3.4.6/700-pr15068-fix.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sat Apr 26 21:31:05 2008 +0000 (2008-04-26)
changeset 454 372b2f397baa
permissions -rw-r--r--
Configure tsocks with a simple heuristic.

Consider the proxy has to be in a 'local' network. It means it is directly
reachable by the local machine, even if the local machine has to hop through
one or more gates to reach the proxy (often the case in enterprise networks
where class A 10.0.0.0/8 is in fact sub-divided into smaller networks, each
one of them in a different location, eg. 10.1.0.0/16 in a place, while
10.2.0.0/16 would be on the other side of the world). Not being in the same
subnet does not mean the proxy is not available.

So we will build a mask with at most high bits set, which defines a network
that has both the local machine and the proxy. Because a machine may have
more than one interface, build a mask for each of them, removing 127.0.0.1
which is added automagically by tsocks, and removing duplicate masks.

If all of this does not work, then it means the local machine can NOT in fact
reach the proxy, which in turn means the user mis-configured something (most
probably a typo...).

/trunk/scripts/crosstool.sh | 61 52 9 0 +++++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 52 insertions(+), 9 deletions(-)
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)