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(-)
1 diff -durN gcc-3.4.6.orig/gcc/config/arm/arm.c gcc-3.4.6/gcc/config/arm/arm.c
2 --- gcc-3.4.6.orig/gcc/config/arm/arm.c 2005-10-01 15:31:38.000000000 +0200
3 +++ gcc-3.4.6/gcc/config/arm/arm.c 2007-08-15 22:54:59.000000000 +0200
5 *load_offset = unsorted_offsets[order[0]];
8 + /* For XScale a two-word LDM is a performance loss, so only do this if
9 + size is more important. See comments in arm_gen_load_multiple. */
10 + if (nops == 2 && arm_tune_xscale && !optimize_size)
13 if (unsorted_offsets[order[0]] == 0)
16 @@ -5083,6 +5088,11 @@
17 *load_offset = unsorted_offsets[order[0]];
20 + /* For XScale a two-word LDM is a performance loss, so only do this if
21 + size is more important. See comments in arm_gen_load_multiple. */
22 + if (nops == 2 && arm_tune_xscale && !optimize_size)
25 if (unsorted_offsets[order[0]] == 0)
28 diff -durN gcc-3.4.6.orig/gcc/config/arm/arm.md gcc-3.4.6/gcc/config/arm/arm.md
29 --- gcc-3.4.6.orig/gcc/config/arm/arm.md 2005-10-01 15:31:38.000000000 +0200
30 +++ gcc-3.4.6/gcc/config/arm/arm.md 2007-08-15 22:54:59.000000000 +0200
31 @@ -8811,13 +8811,16 @@
32 (set_attr "length" "4,8,8")]
35 +; Try to convert LDR+LDR+arith into [add+]LDM+arith
36 +; On XScale, LDM is always slower than two LDRs, so only do this if
37 +; optimising for size.
38 (define_insn "*arith_adjacentmem"
39 [(set (match_operand:SI 0 "s_register_operand" "=r")
40 (match_operator:SI 1 "shiftable_operator"
41 [(match_operand:SI 2 "memory_operand" "m")
42 (match_operand:SI 3 "memory_operand" "m")]))
43 (clobber (match_scratch:SI 4 "=r"))]
44 - "TARGET_ARM && adjacent_mem_locations (operands[2], operands[3])"
45 + "TARGET_ARM && (!arm_tune_xscale || optimize_size) && adjacent_mem_locations (operands[2], operands[3])"
53 + /* This would be a loss on a Harvard core, but adjacent_mem_locations()
54 + will prevent it from happening. */
56 ldm[0] = ops[0] = operands[4];
57 ops[1] = XEXP (XEXP (operands[2], 0), 0);
58 diff -durN gcc-3.4.6.orig/gcc/genpeep.c gcc-3.4.6/gcc/genpeep.c
59 --- gcc-3.4.6.orig/gcc/genpeep.c 2003-07-05 07:27:22.000000000 +0200
60 +++ gcc-3.4.6/gcc/genpeep.c 2007-08-15 22:54:59.000000000 +0200
62 printf ("#include \"recog.h\"\n");
63 printf ("#include \"except.h\"\n\n");
64 printf ("#include \"function.h\"\n\n");
65 + printf ("#include \"flags.h\"\n\n");
67 printf ("#ifdef HAVE_peephole\n");
68 printf ("extern rtx peep_operand[];\n\n");