[tor-commits] [orbot/master] updated privoxy files

n8fr8 at torproject.org n8fr8 at torproject.org
Thu Jun 21 03:59:35 UTC 2012


commit 006c9502e0c49e5ad9ed19a24bd9441f220c3449
Author: n8fr8 <nathan at freitas.net>
Date:   Tue Jun 5 12:05:39 2012 -0400

    updated privoxy files
---
 external/privoxy/GNUmakefile   |   12 +-
 external/privoxy/Makefile      |  108 ---------
 external/privoxy/config.guess  |  490 +++++++++++++++++++-------------------
 external/privoxy/config.h      |    4 +-
 external/privoxy/config.log    |  513 +++++++++++++++++++++++-----------------
 external/privoxy/config.status |   32 ++-
 external/privoxy/config.sub    |  261 +++++++++++++++------
 external/privoxy/configure     |    2 +-
 8 files changed, 750 insertions(+), 672 deletions(-)

diff --git a/external/privoxy/GNUmakefile b/external/privoxy/GNUmakefile
index a51a130..20ea605 100644
--- a/external/privoxy/GNUmakefile
+++ b/external/privoxy/GNUmakefile
@@ -56,7 +56,7 @@ USER         =
 GROUP	   = 
 
 datarootdir  = ${prefix}/share
-prefix       = /home/n8fr8/dev/android/ndk/my-android-toolchain
+prefix       = /usr/local
 exec_prefix  = ${prefix}
 CONF_BASE    = ${prefix}/etc
 SBIN_DEST    = ${exec_prefix}/sbin
@@ -105,7 +105,7 @@ INSTALL_R  = -m $(RWD_MODE)
 #############################################################################
 
 PROGRAM    = privoxy
-CC         = arm-linux-androideabi-gcc
+CC         = /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm
 ECHO       = echo
 GZIP_PROG  = gzip
 
@@ -113,7 +113,7 @@ GZIP_PROG  = gzip
 # Solaris.
 #ID         = id -u
 ID         = id
-LD         = arm-linux-androideabi-gcc
+LD         = /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm
 RM         = rm -f
 CP         = cp -f
 RMDIR      = rmdir
@@ -220,7 +220,7 @@ PROJECT_H_DEPS = project.h $(REGEX_HDRS) $(PCRS_HDRS) pcre/pcre.h
 SOCKET_LIB   = 
 
 # PThreads library, if needed.
-PTHREAD_LIB  = #-lpthread
+PTHREAD_LIB  = 
 
 SRCS         = $(C_SRC)  $(W32_SRC)  $(PCRS_SRC)  $(PCRE_SRC)  $(REGEX_SRC)
 OBJS         = $(C_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS)
@@ -242,10 +242,10 @@ SPECIAL_CFLAGS =
 # Add your flags here 
 OTHER_CFLAGS =   
 
-CFLAGS = -pipe -O2 --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \
+CFLAGS = -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os  $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \
           -Ipcre 
 
-LDFLAGS = -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS)
+LDFLAGS = -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS)
 
 
 #############################################################################
diff --git a/external/privoxy/Makefile b/external/privoxy/Makefile
deleted file mode 100644
index ed6d7ac..0000000
--- a/external/privoxy/Makefile
+++ /dev/null
@@ -1,108 +0,0 @@
-# $Id: Makefile,v 1.11 2006/07/18 14:48:45 david__schmidt Exp $
-#
-# Written by and Copyright (C) 2001 the SourceForge
-# Privoxy team. http://www.privoxy.org/
-#
-# Based on the Internet Junkbuster originally written
-# by and Copyright (C) 1997 Anonymous Coders and 
-# Junkbusters Corporation.  http://www.junkbusters.com
-#
-# This program is free software; you can redistribute it 
-# and/or modify it under the terms of the GNU General
-# Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will
-# be useful, but WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.  See the GNU General Public
-# License for more details.
-#
-# The GNU General Public License should be included with
-# this file.  If not, you can view it at
-# http://www.gnu.org/copyleft/gpl.html
-# or write to the Free Software Foundation, Inc., 59
-# Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# $Log: Makefile,v $
-# Revision 1.11  2006/07/18 14:48:45  david__schmidt
-# Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
-# with what was really the latest development (the v_3_0_branch branch)
-#
-# Revision 1.5.2.2  2002/10/25 02:44:23  hal9
-# Port of make install, etc from main trunk. Needs testing! Add Slackware
-# support, and other related changes. Update related docs.
-#
-# Revision 1.5.2.1  2002/08/05 17:46:13  oes
-# Change make to gmake to fix auto-build on Solaris
-#
-# Revision 1.5  2002/04/11 12:51:34  oes
-# Bugfix
-#
-# Revision 1.4  2002/04/09 16:38:10  oes
-# Added option to run the whole build process
-#
-# Revision 1.3  2002/03/26 22:29:54  swa
-# we have a new homepage!
-#
-# Revision 1.2  2002/03/24 13:25:42  swa
-# name change related issues
-#
-# Revision 1.1  2001/12/01 11:24:29  jongfoster
-# Will display a warning if non-GNU make is used
-#
-#
-
-#############################################################################
-
-GNU_MAKE_CMD = gmake
-MAKE_CMD     = make
-
-error:
-	@if [ -f GNUmakefile ]; then \
-	    echo "***"; \
-	    echo "*** You are not using the GNU version of Make - maybe it's called gmake"; \
-	    echo "*** or it's in a different PATH? Please read INSTALL." ; \
-	    echo "***"; \
-	    exit 1; \
-	 elif test -n "$(HOST_ARCH)"  && test -z "$(MAKE_VERSION)" ; then \
-	    echo "***"; \
-	    echo "*** You are not using GNU Make on Solaris, please make sure you do" ; \
-	    echo "*** and re-run 'make' "; \
-	    echo "***"; \
-	    exit 1 ; \
-	 elif test -n "$(MACHINE_ARCH)"  && test -z "$(MAKE_VERSION)" ; then \
-	    echo "***"; \
-	    echo "*** You are not using GNU Make on FreeBSD, please make sure you do" ; \
-	    echo "*** and re-run 'make' "; \
-	    echo "***"; \
-	    exit 1 ; \
-	 else \
-	    echo "***"; \
-	    echo "*** To build this program, you must run"; \
-	    echo "*** autoheader && autoconf && ./configure and then run GNU make."; \
-	    echo "***"; \
-	    echo -n "*** Shall I do this for you now? (y/n) "; \
-	    read answer; \
-	    if [ "$$answer" = "y" ]; then \
-		autoheader && autoconf && ./configure || exit 1; \
-	  	if $(GNU_MAKE_CMD) -v |grep GNU >/dev/null 2>/dev/null; then \
-		   $(GNU_MAKE_CMD) ;\
-		elif $(MAKE_CMD) -v |grep GNU >/dev/null 2>/dev/null; then \
-		   $(MAKE_CMD) ;\
-		else \
-		   echo "Neither 'make' nor 'gmake' are GNU compatible!" ; \
-		   echo "Please read INSTALL." ; \
-		   exit 1 ; \
-		fi ;\
-	    fi; \
-	 fi
-
-.PHONY: error
-
-#############################################################################
-
-## Local Variables:
-## tab-width: 3
-## end:
diff --git a/external/privoxy/config.guess b/external/privoxy/config.guess
index f32079a..d622a44 100644
--- a/external/privoxy/config.guess
+++ b/external/privoxy/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2008-01-23'
+timestamp='2012-02-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@ timestamp='2008-01-23'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -27,16 +25,16 @@ timestamp='2008-01-23'
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <per at bothner.com>.
-# Please send patches to <config-patches at gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches at gnu.org> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,8 +54,9 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -144,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -170,7 +169,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -180,7 +179,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -223,7 +222,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -269,7 +268,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -295,7 +297,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -324,14 +326,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@@ -375,23 +396,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -461,8 +482,8 @@ EOF
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -475,7 +496,7 @@ EOF
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -532,7 +553,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -575,52 +596,52 @@ EOF
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+		    sed 's/^		//' << EOF >$dummy.c
 
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
 
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
 
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -640,7 +661,7 @@ EOF
 	    # => hppa64-hp-hpux11.23
 
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -711,22 +732,22 @@ EOF
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+	exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+	exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+	exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+	exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -750,14 +771,14 @@ EOF
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -769,13 +790,12 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
@@ -784,19 +804,22 @@ EOF
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
     i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:[3456]*)
-    	case ${UNAME_MACHINE} in
+    *:Interix*:*)
+	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd)
+	    authenticamd | genuineintel | EM64T)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@@ -806,6 +829,9 @@ EOF
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -835,6 +861,27 @@ EOF
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -842,20 +889,40 @@ EOF
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -866,74 +933,33 @@ EOF
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    mips:Linux:*:*)
+    mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef mips
-	#undef mipsel
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-gnu
 	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
@@ -943,14 +969,17 @@ EOF
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -958,78 +987,18 @@ EOF
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1037,11 +1006,11 @@ EOF
 	echo i386-sequent-sysv4
 	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1058,7 +1027,7 @@ EOF
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
@@ -1073,7 +1042,7 @@ EOF
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1101,10 +1070,13 @@ EOF
 	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit ;;
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+	exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1139,8 +1111,18 @@ EOF
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
@@ -1153,7 +1135,7 @@ EOF
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)
@@ -1173,10 +1155,10 @@ EOF
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel at ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel at ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes at openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1202,11 +1184,11 @@ EOF
 	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1216,6 +1198,9 @@ EOF
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1243,6 +1228,16 @@ EOF
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1258,6 +1253,9 @@ EOF
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
@@ -1303,13 +1301,13 @@ EOF
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1324,6 +1322,12 @@ EOF
     i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
 	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1346,11 +1350,11 @@ main ()
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-          "4"
+	"4"
 #else
-	  ""
+	""
 #endif
-         ); exit (0);
+	); exit (0);
 #endif
 #endif
 
diff --git a/external/privoxy/config.h b/external/privoxy/config.h
index db1f360..7b5a17c 100644
--- a/external/privoxy/config.h
+++ b/external/privoxy/config.h
@@ -373,12 +373,12 @@
 /*
  * Keep outgoing connections alive if possible.
  */
-/* #undef FEATURE_CONNECTION_KEEP_ALIVE */
+#define FEATURE_CONNECTION_KEEP_ALIVE 1
 
 /*
  * Use POSIX threads instead of native threads.
  */
-/* #undef FEATURE_PTHREAD */
+#define FEATURE_PTHREAD 1
 
 /*
  * Enables statistics function.
diff --git a/external/privoxy/config.log b/external/privoxy/config.log
index 3546917..16ce585 100644
--- a/external/privoxy/config.log
+++ b/external/privoxy/config.log
@@ -4,7 +4,7 @@ running configure, to aid debugging if configure makes a mistake.
 It was created by configure, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
-  $ ./configure --host=arm-linux-eabi --build= --prefix=/home/n8fr8/dev/android/ndk/my-android-toolchain --disable-pthread
+  $ ./configure --host=arm-linux-eabi --enable-pthread
 
 ## --------- ##
 ## Platform. ##
@@ -12,9 +12,9 @@ generated by GNU Autoconf 2.68.  Invocation command line was
 
 hostname = didactic
 uname -m = i686
-uname -r = 3.3.0-030300-generic
+uname -r = 3.2.0-24-generic-pae
 uname -s = Linux
-uname -v = #201203182135 SMP Mon Mar 19 01:43:18 UTC 2012
+uname -v = #39-Ubuntu SMP Mon May 21 18:54:21 UTC 2012
 
 /usr/bin/uname -p = unknown
 /bin/uname -X     = unknown
@@ -27,7 +27,6 @@ uname -v = #201203182135 SMP Mon Mar 19 01:43:18 UTC 2012
 /usr/bin/oslevel       = unknown
 /bin/universe          = unknown
 
-PATH: /home/n8fr8/dev/android/ndk/my-android-toolchain/bin/
 PATH: /home/n8fr8/bin
 PATH: /usr/lib/lightdm/lightdm
 PATH: /usr/local/sbin
@@ -41,6 +40,9 @@ PATH: /home/n8fr8/dev/android/tools
 PATH: /home/n8fr8/dev/android/platform-tools
 PATH: /home/n8fr8/dev/android/ndk
 PATH: /home/n8fr8/bin
+PATH: /home/n8fr8/dev/gp/projects/fdroid/fdroidserver
+PATH: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/`uname -s | tr '[A-Z]' '[a-z]'`-x86/bin
+PATH: /home/n8fr8/dev/gp/repos/orbot/external/bin
 
 
 ## ----------- ##
@@ -48,70 +50,70 @@ PATH: /home/n8fr8/bin
 ## ----------- ##
 
 configure:2443: checking build system type
-configure:2457: result: i686-pc-linux-gnulibc1
+configure:2457: result: i686-pc-linux-gnu
 configure:2477: checking host system type
 configure:2490: result: arm-linux-eabi
 configure:2583: checking for arm-linux-eabi-gcc
-configure:2610: result: arm-linux-androideabi-gcc
+configure:2610: result: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm
 configure:2879: checking for C compiler version
-configure:2888: arm-linux-androideabi-gcc --version >&5
+configure:2888: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm --version >&5
 arm-linux-androideabi-gcc (GCC) 4.4.3
 Copyright (C) 2009 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 configure:2899: $? = 0
-configure:2888: arm-linux-androideabi-gcc -v >&5
+configure:2888: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -v >&5
 Using built-in specs.
 Target: arm-linux-androideabi
 Configured with: /tmp/ndk-digit/src/build/../gcc/gcc-4.4.3/configure --prefix=/opt/digit/repo/master/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86 --target=arm-linux-androideabi --host=x86_64-linux-gnu --build=x86_64-linux-gnu --with-gnu-as --with-gnu-ld --enable-languages=c,c++ --with-gmp=/tmp/ndk-digit/build/toolchain/temp-install --with-mpfr=/tmp/ndk-digit/build/toolchain/temp-install --disable-libssp --enable-threads --disable-nls --disable-libmudflap --disable-libgomp --disable-libstdc__-v3 --disable-sjlj-exceptions --disable-shared --disable-tls --with-float=soft --with-fpu=vfp --with-arch=armv5te --enable-target-optspace --enable-initfini-array --disable-nls --prefix=/opt/digit/repo/master/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86 --with-sysroot=/opt/digit/repo/master/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/sysroot --with-binutils-version=2.19 --with-mpfr-version=2.4.1 --with-mpc-version=0.8.1 --with-gmp-versio
 n=4.2.4 --with-gcc-version=4.4.3 --with-gdb-version=6.6 --disable-bootstrap --disable-libquadmath --disable-plugin --with-arch=armv5te --program-transform-name='s,^,arm-linux-androideabi-,'
 Thread model: posix
 gcc version 4.4.3 (GCC) 
 configure:2899: $? = 0
-configure:2888: arm-linux-androideabi-gcc -V >&5
-arm-linux-androideabi-gcc: '-V' option must have argument
+configure:2888: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -V >&5
+arm-linux-androideabi-gcc: '-V' must come at the start of the command line
 configure:2899: $? = 1
-configure:2888: arm-linux-androideabi-gcc -qversion >&5
+configure:2888: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -qversion >&5
 arm-linux-androideabi-gcc: unrecognized option '-qversion'
 arm-linux-androideabi-gcc: no input files
 configure:2899: $? = 1
 configure:2919: checking whether the C compiler works
-configure:2941: arm-linux-androideabi-gcc   --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  >&5
+configure:2941: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os  -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  >&5
 configure:2945: $? = 0
 configure:2993: result: yes
 configure:2996: checking for C compiler default output file name
 configure:2998: result: a.out
 configure:3004: checking for suffix of executables
-configure:3011: arm-linux-androideabi-gcc -o conftest   --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  >&5
+configure:3011: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os  -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  >&5
 configure:3015: $? = 0
 configure:3037: result: 
 configure:3059: checking whether we are cross compiling
-configure:3067: arm-linux-androideabi-gcc -o conftest   --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  >&5
+configure:3067: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os  -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  >&5
 configure:3071: $? = 0
 configure:3078: ./conftest
 ./configure: line 3080: ./conftest: cannot execute binary file
 configure:3082: $? = 126
 configure:3097: result: yes
 configure:3102: checking for suffix of object files
-configure:3124: arm-linux-androideabi-gcc -c   --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c >&5
+configure:3124: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os  conftest.c >&5
 configure:3128: $? = 0
 configure:3149: result: o
 configure:3153: checking whether we are using the GNU C compiler
-configure:3172: arm-linux-androideabi-gcc -c   --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c >&5
+configure:3172: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os  conftest.c >&5
 configure:3172: $? = 0
 configure:3181: result: yes
-configure:3190: checking whether arm-linux-androideabi-gcc accepts -g
-configure:3210: arm-linux-androideabi-gcc -c -g --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c >&5
+configure:3190: checking whether /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm accepts -g
+configure:3210: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -g  conftest.c >&5
 configure:3210: $? = 0
 configure:3251: result: yes
-configure:3268: checking for arm-linux-androideabi-gcc option to accept ISO C89
-configure:3332: arm-linux-androideabi-gcc  -c   --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c >&5
+configure:3268: checking for /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm option to accept ISO C89
+configure:3332: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm  -c -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os  conftest.c >&5
 configure:3332: $? = 0
 configure:3345: result: none needed
 configure:3370: checking how to run the C preprocessor
-configure:3401: arm-linux-androideabi-gcc -E --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c
+configure:3401: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -E  conftest.c
 configure:3401: $? = 0
-configure:3415: arm-linux-androideabi-gcc -E --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c
+configure:3415: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -E  conftest.c
 conftest.c:14:28: error: ac_nonexistent.h: No such file or directory
 configure:3415: $? = 1
 configure: failed program was:
@@ -129,10 +131,10 @@ configure: failed program was:
 | #define CODE_STATUS "stable"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:3440: result: arm-linux-androideabi-gcc -E
-configure:3460: arm-linux-androideabi-gcc -E --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c
+configure:3440: result: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -E
+configure:3460: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -E  conftest.c
 configure:3460: $? = 0
-configure:3474: arm-linux-androideabi-gcc -E --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c
+configure:3474: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -E  conftest.c
 conftest.c:14:28: error: ac_nonexistent.h: No such file or directory
 configure:3474: $? = 1
 configure: failed program was:
@@ -189,60 +191,95 @@ configure:4357: result: /bin/grep
 configure:4362: checking for egrep
 configure:4424: result: /bin/grep -E
 configure:4429: checking for ANSI C header files
-configure:4449: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:4449: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:4449: $? = 0
 configure:4533: result: yes
 configure:4546: checking for sys/types.h
-configure:4546: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:4546: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:4546: $? = 0
 configure:4546: result: yes
 configure:4546: checking for sys/stat.h
-configure:4546: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:4546: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:4546: $? = 0
 configure:4546: result: yes
 configure:4546: checking for stdlib.h
-configure:4546: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:4546: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:4546: $? = 0
 configure:4546: result: yes
 configure:4546: checking for string.h
-configure:4546: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:4546: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:4546: $? = 0
 configure:4546: result: yes
 configure:4546: checking for memory.h
-configure:4546: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:4546: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:4546: $? = 0
 configure:4546: result: yes
 configure:4546: checking for strings.h
-configure:4546: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:4546: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:4546: $? = 0
 configure:4546: result: yes
 configure:4546: checking for inttypes.h
-configure:4546: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:4546: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:4546: $? = 0
 configure:4546: result: yes
 configure:4546: checking for stdint.h
-configure:4546: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:4546: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:4546: $? = 0
 configure:4546: result: yes
 configure:4546: checking for unistd.h
-configure:4546: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:4546: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:4546: $? = 0
 configure:4546: result: yes
 configure:4558: checking pthread.h usability
-configure:4558: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:4558: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:4558: $? = 0
 configure:4558: result: yes
 configure:4558: checking pthread.h presence
-configure:4558: arm-linux-androideabi-gcc -E --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include  conftest.c
+configure:4558: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -E   conftest.c
 configure:4558: $? = 0
 configure:4558: result: yes
 configure:4558: checking for pthread.h
 configure:4558: result: yes
-configure:4572: WARNING: pthreads seem to be available but you are using --disable-pthread.
-configure:4574: WARNING: This is almost always a mistake and can render Privoxy unacceptable slow.
+configure:4603: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os  -pthread  -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
+/home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/../lib/gcc/arm-linux-androideabi/4.4.3/../../../../arm-linux-androideabi/bin/ld: cannot find -lpthread
+collect2: ld returned 1 exit status
+configure:4603: $? = 1
+configure: failed program was:
+| /* confdefs.h */
+| #define PACKAGE_NAME ""
+| #define PACKAGE_TARNAME ""
+| #define PACKAGE_VERSION ""
+| #define PACKAGE_STRING ""
+| #define PACKAGE_BUGREPORT ""
+| #define PACKAGE_URL ""
+| #define VERSION_MAJOR 3
+| #define VERSION_MINOR 0
+| #define VERSION_POINT 12
+| #define VERSION "3.0.12"
+| #define CODE_STATUS "stable"
+| #define STDC_HEADERS 1
+| #define HAVE_SYS_TYPES_H 1
+| #define HAVE_SYS_STAT_H 1
+| #define HAVE_STDLIB_H 1
+| #define HAVE_STRING_H 1
+| #define HAVE_MEMORY_H 1
+| #define HAVE_STRINGS_H 1
+| #define HAVE_INTTYPES_H 1
+| #define HAVE_STDINT_H 1
+| #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
+| /* end confdefs.h.  */
+| #include <pthread.h>
+| int
+| main ()
+| {
+| void *p = pthread_create;
+|   ;
+|   return 0;
+| }
 configure:4624: checking for gethostbyname in -lnsl
-configure:4649: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c -lnsl   1>&5
-/home/n8fr8/dev/android/ndk/my-android-toolchain/bin/../lib/gcc/arm-linux-androideabi/4.4.3/../../../../arm-linux-androideabi/bin/ld: cannot find -lnsl
+configure:4649: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c -lnsl   1>&5
+/home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/../lib/gcc/arm-linux-androideabi/4.4.3/../../../../arm-linux-androideabi/bin/ld: cannot find -lnsl
 collect2: ld returned 1 exit status
 configure:4649: $? = 1
 configure: failed program was:
@@ -268,6 +305,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | /* end confdefs.h.  */
 | 
 | /* Override any GCC internal prototype to avoid an error.
@@ -286,9 +324,9 @@ configure: failed program was:
 | }
 configure:4658: result: no
 configure:4670: checking for gethostbyaddr_r
-configure:4670: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
-/tmp/ccoMoDoy.o: In function `main':
-conftest.c:(.text+0x4): undefined reference to `gethostbyaddr_r'
+configure:4670: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
+/tmp/ccSbib0J.o: In function `main':
+conftest.c:(.text.main+0x4): undefined reference to `gethostbyaddr_r'
 collect2: ld returned 1 exit status
 configure:4670: $? = 1
 configure: failed program was:
@@ -314,6 +352,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | /* end confdefs.h.  */
 | /* Define gethostbyaddr_r to an innocuous variant, in case <limits.h> declares gethostbyaddr_r.
 |    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
@@ -356,33 +395,33 @@ configure: failed program was:
 configure:4670: result: no
 configure:4771: result: no
 configure:4777: checking for gethostbyname_r
-configure:4777: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
+configure:4777: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
 configure:4777: $? = 0
 configure:4777: result: yes
 configure:4780: checking signature of gethostbyname_r
-configure:4800: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:4800: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:4800: $? = 0
 configure:4804: result: 6 args
 configure:4883: checking for gmtime_r
-configure:4883: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
+configure:4883: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
 configure:4883: $? = 0
 configure:4883: result: yes
 configure:4886: checking signature of gmtime_r
-configure:4905: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:4905: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 conftest.c: In function 'main':
-conftest.c:34: warning: passing argument 1 of 'gmtime_r' from incompatible pointer type
-/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include/time.h:77: note: expected 'const time_t *' but argument is of type 'struct time *'
+conftest.c:35: warning: passing argument 1 of 'gmtime_r' from incompatible pointer type
+/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include/time.h:77: note: expected 'const time_t *' but argument is of type 'struct time *'
 configure:4905: $? = 0
 configure:4907: result: ok
 configure:4928: checking for localtime_r
-configure:4928: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
+configure:4928: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
 configure:4928: $? = 0
 configure:4928: result: yes
 configure:4931: checking signature of localtime_r
-configure:4950: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:4950: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 conftest.c: In function 'main':
-conftest.c:35: warning: passing argument 1 of 'localtime_r' from incompatible pointer type
-/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include/time.h:74: note: expected 'const time_t *' but argument is of type 'struct time *'
+conftest.c:36: warning: passing argument 1 of 'localtime_r' from incompatible pointer type
+/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include/time.h:74: note: expected 'const time_t *' but argument is of type 'struct time *'
 configure:4950: $? = 0
 configure:4952: result: ok
 configure:4996: checking for socklen_t
@@ -390,23 +429,23 @@ configure:5005: result: yes
 configure:5051: checking for ANSI C header files
 configure:5155: result: yes
 configure:5166: checking for dirent.h that defines DIR
-configure:5185: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5185: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5185: $? = 0
 configure:5193: result: yes
 configure:5206: checking for library containing opendir
-configure:5237: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
+configure:5237: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
 configure:5237: $? = 0
 configure:5254: result: none required
 configure:5321: checking for an ANSI C-conforming const
-configure:5386: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5386: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5386: $? = 0
 configure:5393: result: yes
 configure:5401: checking for size_t
-configure:5401: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5401: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5401: $? = 0
-configure:5401: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5401: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 conftest.c: In function 'main':
-conftest.c:65: error: expected expression before ')' token
+conftest.c:66: error: expected expression before ')' token
 configure:5401: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -431,6 +470,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | #define HAVE_GETHOSTBYNAME_R_6_ARGS 1
 | #define HAVE_GMTIME_R 1
 | #define HAVE_LOCALTIME_R 1
@@ -480,11 +520,11 @@ configure: failed program was:
 | }
 configure:5401: result: yes
 configure:5412: checking for pid_t
-configure:5412: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5412: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5412: $? = 0
-configure:5412: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5412: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 conftest.c: In function 'main':
-conftest.c:65: error: expected expression before ')' token
+conftest.c:66: error: expected expression before ')' token
 configure:5412: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -509,6 +549,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | #define HAVE_GETHOSTBYNAME_R_6_ARGS 1
 | #define HAVE_GMTIME_R 1
 | #define HAVE_LOCALTIME_R 1
@@ -558,19 +599,19 @@ configure: failed program was:
 | }
 configure:5412: result: yes
 configure:5423: checking whether time.h and sys/time.h may both be included
-configure:5443: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5443: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5443: $? = 0
 configure:5450: result: yes
 configure:5458: checking whether struct tm is in sys/time.h or time.h
-configure:5478: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5478: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5478: $? = 0
 configure:5485: result: time.h
 configure:5497: checking size of int
-configure:5502: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5502: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5502: $? = 0
-configure:5502: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5502: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 conftest.c: In function 'main':
-conftest.c:66: error: size of array 'test_array' is negative
+conftest.c:67: error: size of array 'test_array' is negative
 configure:5502: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -595,6 +636,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | #define HAVE_GETHOSTBYNAME_R_6_ARGS 1
 | #define HAVE_GMTIME_R 1
 | #define HAVE_LOCALTIME_R 1
@@ -644,9 +686,9 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:5502: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5502: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 conftest.c: In function 'main':
-conftest.c:66: error: size of array 'test_array' is negative
+conftest.c:67: error: size of array 'test_array' is negative
 configure:5502: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -671,6 +713,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | #define HAVE_GETHOSTBYNAME_R_6_ARGS 1
 | #define HAVE_GMTIME_R 1
 | #define HAVE_LOCALTIME_R 1
@@ -720,9 +763,9 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:5502: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5502: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 conftest.c: In function 'main':
-conftest.c:66: error: size of array 'test_array' is negative
+conftest.c:67: error: size of array 'test_array' is negative
 configure:5502: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -747,6 +790,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | #define HAVE_GETHOSTBYNAME_R_6_ARGS 1
 | #define HAVE_GMTIME_R 1
 | #define HAVE_LOCALTIME_R 1
@@ -796,19 +840,19 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:5502: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5502: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5502: $? = 0
-configure:5502: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5502: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5502: $? = 0
-configure:5502: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5502: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5502: $? = 0
 configure:5516: result: 4
 configure:5530: checking size of char *
-configure:5535: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5535: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5535: $? = 0
-configure:5535: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5535: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 conftest.c: In function 'main':
-conftest.c:67: error: size of array 'test_array' is negative
+conftest.c:68: error: size of array 'test_array' is negative
 configure:5535: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -833,6 +877,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | #define HAVE_GETHOSTBYNAME_R_6_ARGS 1
 | #define HAVE_GMTIME_R 1
 | #define HAVE_LOCALTIME_R 1
@@ -883,9 +928,9 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:5535: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5535: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 conftest.c: In function 'main':
-conftest.c:67: error: size of array 'test_array' is negative
+conftest.c:68: error: size of array 'test_array' is negative
 configure:5535: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -910,6 +955,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | #define HAVE_GETHOSTBYNAME_R_6_ARGS 1
 | #define HAVE_GMTIME_R 1
 | #define HAVE_LOCALTIME_R 1
@@ -960,9 +1006,9 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:5535: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5535: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 conftest.c: In function 'main':
-conftest.c:67: error: size of array 'test_array' is negative
+conftest.c:68: error: size of array 'test_array' is negative
 configure:5535: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -987,6 +1033,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | #define HAVE_GETHOSTBYNAME_R_6_ARGS 1
 | #define HAVE_GMTIME_R 1
 | #define HAVE_LOCALTIME_R 1
@@ -1037,19 +1084,19 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:5535: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5535: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5535: $? = 0
-configure:5535: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5535: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5535: $? = 0
-configure:5535: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5535: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5535: $? = 0
 configure:5549: result: 4
 configure:5563: checking size of long
-configure:5568: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5568: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5568: $? = 0
-configure:5568: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5568: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 conftest.c: In function 'main':
-conftest.c:68: error: size of array 'test_array' is negative
+conftest.c:69: error: size of array 'test_array' is negative
 configure:5568: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -1074,6 +1121,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | #define HAVE_GETHOSTBYNAME_R_6_ARGS 1
 | #define HAVE_GMTIME_R 1
 | #define HAVE_LOCALTIME_R 1
@@ -1125,9 +1173,9 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:5568: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5568: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 conftest.c: In function 'main':
-conftest.c:68: error: size of array 'test_array' is negative
+conftest.c:69: error: size of array 'test_array' is negative
 configure:5568: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -1152,6 +1200,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | #define HAVE_GETHOSTBYNAME_R_6_ARGS 1
 | #define HAVE_GMTIME_R 1
 | #define HAVE_LOCALTIME_R 1
@@ -1203,9 +1252,9 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:5568: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5568: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 conftest.c: In function 'main':
-conftest.c:68: error: size of array 'test_array' is negative
+conftest.c:69: error: size of array 'test_array' is negative
 configure:5568: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -1230,6 +1279,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | #define HAVE_GETHOSTBYNAME_R_6_ARGS 1
 | #define HAVE_GMTIME_R 1
 | #define HAVE_LOCALTIME_R 1
@@ -1281,19 +1331,19 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:5568: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5568: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5568: $? = 0
-configure:5568: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5568: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5568: $? = 0
-configure:5568: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5568: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5568: $? = 0
 configure:5582: result: 4
 configure:5596: checking size of long long
-configure:5601: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5601: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5601: $? = 0
-configure:5601: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5601: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 conftest.c: In function 'main':
-conftest.c:69: error: size of array 'test_array' is negative
+conftest.c:70: error: size of array 'test_array' is negative
 configure:5601: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -1318,6 +1368,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | #define HAVE_GETHOSTBYNAME_R_6_ARGS 1
 | #define HAVE_GMTIME_R 1
 | #define HAVE_LOCALTIME_R 1
@@ -1370,9 +1421,9 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:5601: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5601: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 conftest.c: In function 'main':
-conftest.c:69: error: size of array 'test_array' is negative
+conftest.c:70: error: size of array 'test_array' is negative
 configure:5601: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -1397,6 +1448,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | #define HAVE_GETHOSTBYNAME_R_6_ARGS 1
 | #define HAVE_GMTIME_R 1
 | #define HAVE_LOCALTIME_R 1
@@ -1449,9 +1501,9 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:5601: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5601: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 conftest.c: In function 'main':
-conftest.c:69: error: size of array 'test_array' is negative
+conftest.c:70: error: size of array 'test_array' is negative
 configure:5601: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -1476,6 +1528,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | #define HAVE_GETHOSTBYNAME_R_6_ARGS 1
 | #define HAVE_GMTIME_R 1
 | #define HAVE_LOCALTIME_R 1
@@ -1528,9 +1581,9 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:5601: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5601: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 conftest.c: In function 'main':
-conftest.c:69: error: size of array 'test_array' is negative
+conftest.c:70: error: size of array 'test_array' is negative
 configure:5601: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -1555,6 +1608,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | #define HAVE_GETHOSTBYNAME_R_6_ARGS 1
 | #define HAVE_GMTIME_R 1
 | #define HAVE_LOCALTIME_R 1
@@ -1607,21 +1661,21 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:5601: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5601: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5601: $? = 0
-configure:5601: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5601: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5601: $? = 0
-configure:5601: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5601: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5601: $? = 0
-configure:5601: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5601: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5601: $? = 0
 configure:5615: result: 8
 configure:5629: checking size of size_t
-configure:5634: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5634: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5634: $? = 0
-configure:5634: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5634: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 conftest.c: In function 'main':
-conftest.c:70: error: size of array 'test_array' is negative
+conftest.c:71: error: size of array 'test_array' is negative
 configure:5634: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -1646,6 +1700,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | #define HAVE_GETHOSTBYNAME_R_6_ARGS 1
 | #define HAVE_GMTIME_R 1
 | #define HAVE_LOCALTIME_R 1
@@ -1699,9 +1754,9 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:5634: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5634: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 conftest.c: In function 'main':
-conftest.c:70: error: size of array 'test_array' is negative
+conftest.c:71: error: size of array 'test_array' is negative
 configure:5634: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -1726,6 +1781,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | #define HAVE_GETHOSTBYNAME_R_6_ARGS 1
 | #define HAVE_GMTIME_R 1
 | #define HAVE_LOCALTIME_R 1
@@ -1779,9 +1835,9 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:5634: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5634: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 conftest.c: In function 'main':
-conftest.c:70: error: size of array 'test_array' is negative
+conftest.c:71: error: size of array 'test_array' is negative
 configure:5634: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -1806,6 +1862,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | #define HAVE_GETHOSTBYNAME_R_6_ARGS 1
 | #define HAVE_GMTIME_R 1
 | #define HAVE_LOCALTIME_R 1
@@ -1859,16 +1916,16 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:5634: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5634: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5634: $? = 0
-configure:5634: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5634: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5634: $? = 0
-configure:5634: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5634: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5634: $? = 0
 configure:5648: result: 4
 configure:5662: checking OS.h usability
-configure:5662: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
-conftest.c:68:16: error: OS.h: No such file or directory
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
+conftest.c:69:16: error: OS.h: No such file or directory
 configure:5662: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -1893,6 +1950,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | #define HAVE_GETHOSTBYNAME_R_6_ARGS 1
 | #define HAVE_GMTIME_R 1
 | #define HAVE_LOCALTIME_R 1
@@ -1941,8 +1999,8 @@ configure: failed program was:
 | #include <OS.h>
 configure:5662: result: no
 configure:5662: checking OS.h presence
-configure:5662: arm-linux-androideabi-gcc -E --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include  conftest.c
-conftest.c:35:16: error: OS.h: No such file or directory
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -E   conftest.c
+conftest.c:36:16: error: OS.h: No such file or directory
 configure:5662: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -1967,6 +2025,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | #define HAVE_GETHOSTBYNAME_R_6_ARGS 1
 | #define HAVE_GMTIME_R 1
 | #define HAVE_LOCALTIME_R 1
@@ -1984,81 +2043,81 @@ configure:5662: result: no
 configure:5662: checking for OS.h
 configure:5662: result: no
 configure:5662: checking arpa/inet.h usability
-configure:5662: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5662: $? = 0
 configure:5662: result: yes
 configure:5662: checking arpa/inet.h presence
-configure:5662: arm-linux-androideabi-gcc -E --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include  conftest.c
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -E   conftest.c
 configure:5662: $? = 0
 configure:5662: result: yes
 configure:5662: checking for arpa/inet.h
 configure:5662: result: yes
 configure:5662: checking errno.h usability
-configure:5662: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5662: $? = 0
 configure:5662: result: yes
 configure:5662: checking errno.h presence
-configure:5662: arm-linux-androideabi-gcc -E --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include  conftest.c
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -E   conftest.c
 configure:5662: $? = 0
 configure:5662: result: yes
 configure:5662: checking for errno.h
 configure:5662: result: yes
 configure:5662: checking fcntl.h usability
-configure:5662: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5662: $? = 0
 configure:5662: result: yes
 configure:5662: checking fcntl.h presence
-configure:5662: arm-linux-androideabi-gcc -E --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include  conftest.c
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -E   conftest.c
 configure:5662: $? = 0
 configure:5662: result: yes
 configure:5662: checking for fcntl.h
 configure:5662: result: yes
 configure:5662: checking limits.h usability
-configure:5662: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5662: $? = 0
 configure:5662: result: yes
 configure:5662: checking limits.h presence
-configure:5662: arm-linux-androideabi-gcc -E --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include  conftest.c
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -E   conftest.c
 configure:5662: $? = 0
 configure:5662: result: yes
 configure:5662: checking for limits.h
 configure:5662: result: yes
 configure:5662: checking locale.h usability
-configure:5662: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5662: $? = 0
 configure:5662: result: yes
 configure:5662: checking locale.h presence
-configure:5662: arm-linux-androideabi-gcc -E --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include  conftest.c
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -E   conftest.c
 configure:5662: $? = 0
 configure:5662: result: yes
 configure:5662: checking for locale.h
 configure:5662: result: yes
 configure:5662: checking netdb.h usability
-configure:5662: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5662: $? = 0
 configure:5662: result: yes
 configure:5662: checking netdb.h presence
-configure:5662: arm-linux-androideabi-gcc -E --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include  conftest.c
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -E   conftest.c
 configure:5662: $? = 0
 configure:5662: result: yes
 configure:5662: checking for netdb.h
 configure:5662: result: yes
 configure:5662: checking netinet/in.h usability
-configure:5662: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5662: $? = 0
 configure:5662: result: yes
 configure:5662: checking netinet/in.h presence
-configure:5662: arm-linux-androideabi-gcc -E --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include  conftest.c
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -E   conftest.c
 configure:5662: $? = 0
 configure:5662: result: yes
 configure:5662: checking for netinet/in.h
 configure:5662: result: yes
 configure:5662: checking stddef.h usability
-configure:5662: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5662: $? = 0
 configure:5662: result: yes
 configure:5662: checking stddef.h presence
-configure:5662: arm-linux-androideabi-gcc -E --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include  conftest.c
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -E   conftest.c
 configure:5662: $? = 0
 configure:5662: result: yes
 configure:5662: checking for stddef.h
@@ -2068,51 +2127,51 @@ configure:5662: result: yes
 configure:5662: checking for string.h
 configure:5662: result: yes
 configure:5662: checking sys/ioctl.h usability
-configure:5662: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5662: $? = 0
 configure:5662: result: yes
 configure:5662: checking sys/ioctl.h presence
-configure:5662: arm-linux-androideabi-gcc -E --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include  conftest.c
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -E   conftest.c
 configure:5662: $? = 0
 configure:5662: result: yes
 configure:5662: checking for sys/ioctl.h
 configure:5662: result: yes
 configure:5662: checking sys/socket.h usability
-configure:5662: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5662: $? = 0
 configure:5662: result: yes
 configure:5662: checking sys/socket.h presence
-configure:5662: arm-linux-androideabi-gcc -E --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include  conftest.c
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -E   conftest.c
 configure:5662: $? = 0
 configure:5662: result: yes
 configure:5662: checking for sys/socket.h
 configure:5662: result: yes
 configure:5662: checking sys/time.h usability
-configure:5662: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5662: $? = 0
 configure:5662: result: yes
 configure:5662: checking sys/time.h presence
-configure:5662: arm-linux-androideabi-gcc -E --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include  conftest.c
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -E   conftest.c
 configure:5662: $? = 0
 configure:5662: result: yes
 configure:5662: checking for sys/time.h
 configure:5662: result: yes
 configure:5662: checking sys/timeb.h usability
-configure:5662: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5662: $? = 0
 configure:5662: result: yes
 configure:5662: checking sys/timeb.h presence
-configure:5662: arm-linux-androideabi-gcc -E --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include  conftest.c
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -E   conftest.c
 configure:5662: $? = 0
 configure:5662: result: yes
 configure:5662: checking for sys/timeb.h
 configure:5662: result: yes
 configure:5662: checking sys/wait.h usability
-configure:5662: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 configure:5662: $? = 0
 configure:5662: result: yes
 configure:5662: checking sys/wait.h presence
-configure:5662: arm-linux-androideabi-gcc -E --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include  conftest.c
+configure:5662: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -E   conftest.c
 configure:5662: $? = 0
 configure:5662: result: yes
 configure:5662: checking for sys/wait.h
@@ -2120,27 +2179,27 @@ configure:5662: result: yes
 configure:5662: checking for unistd.h
 configure:5662: result: yes
 configure:5676: checking for strerror
-configure:5676: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
+configure:5676: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
 configure:5676: $? = 0
 configure:5676: result: yes
 configure:5676: checking for bcopy
-configure:5676: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
-conftest.c:75: warning: conflicting types for built-in function 'bcopy'
+configure:5676: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
+conftest.c:76: warning: conflicting types for built-in function 'bcopy'
 configure:5676: $? = 0
 configure:5676: result: yes
 configure:5676: checking for memmove
-configure:5676: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
-conftest.c:76: warning: conflicting types for built-in function 'memmove'
+configure:5676: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
+conftest.c:77: warning: conflicting types for built-in function 'memmove'
 configure:5676: $? = 0
 configure:5676: result: yes
-configure:5686: checking whether arm-linux-androideabi-gcc needs -traditional
+configure:5686: checking whether /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm needs -traditional
 configure:5720: result: no
 configure:5727: checking whether setpgrp takes no argument
 configure:5759: result: yes
 configure:5767: checking return type of signal handlers
-configure:5785: arm-linux-androideabi-gcc -c -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include conftest.c 1>&5
+configure:5785: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -c -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   conftest.c 1>&5
 conftest.c: In function 'main':
-conftest.c:61: error: void value not ignored as it ought to be
+conftest.c:62: error: void value not ignored as it ought to be
 configure:5785: $? = 1
 configure: failed program was:
 | /* confdefs.h */
@@ -2165,6 +2224,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | #define HAVE_GETHOSTBYNAME_R_6_ARGS 1
 | #define HAVE_GMTIME_R 1
 | #define HAVE_LOCALTIME_R 1
@@ -2209,63 +2269,63 @@ configure: failed program was:
 | }
 configure:5792: result: void
 configure:5803: checking for access
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
 configure:5803: $? = 0
 configure:5803: result: yes
 configure:5803: checking for atexit
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
 configure:5803: $? = 0
 configure:5803: result: yes
 configure:5803: checking for getcwd
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
 configure:5803: $? = 0
 configure:5803: result: yes
 configure:5803: checking for gethostbyaddr
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
 configure:5803: $? = 0
 configure:5803: result: yes
 configure:5803: checking for gethostbyaddr_r
 configure:5803: result: no
 configure:5803: checking for gethostbyname
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
 configure:5803: $? = 0
 configure:5803: result: yes
 configure:5803: checking for gethostbyname_r
 configure:5803: result: yes
 configure:5803: checking for gettimeofday
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
 configure:5803: $? = 0
 configure:5803: result: yes
 configure:5803: checking for inet_ntoa
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
 configure:5803: $? = 0
 configure:5803: result: yes
 configure:5803: checking for localtime_r
 configure:5803: result: yes
 configure:5803: checking for memchr
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
-conftest.c:88: warning: conflicting types for built-in function 'memchr'
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
+conftest.c:89: warning: conflicting types for built-in function 'memchr'
 configure:5803: $? = 0
 configure:5803: result: yes
 configure:5803: checking for memmove
 configure:5803: result: yes
 configure:5803: checking for memset
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
-conftest.c:90: warning: conflicting types for built-in function 'memset'
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
+conftest.c:91: warning: conflicting types for built-in function 'memset'
 configure:5803: $? = 0
 configure:5803: result: yes
 configure:5803: checking for poll
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
 configure:5803: $? = 0
 configure:5803: result: yes
 configure:5803: checking for putenv
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
 configure:5803: $? = 0
 configure:5803: result: yes
 configure:5803: checking for random
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
-/tmp/ccyfkYEq.o: In function `main':
-conftest.c:(.text+0x4): undefined reference to `random'
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
+/tmp/ccuxKjx7.o: In function `main':
+conftest.c:(.text.main+0x4): undefined reference to `random'
 collect2: ld returned 1 exit status
 configure:5803: $? = 1
 configure: failed program was:
@@ -2291,6 +2351,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | #define HAVE_GETHOSTBYNAME_R_6_ARGS 1
 | #define HAVE_GMTIME_R 1
 | #define HAVE_LOCALTIME_R 1
@@ -2378,68 +2439,68 @@ configure: failed program was:
 | }
 configure:5803: result: no
 configure:5803: checking for regcomp
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
 configure:5803: $? = 0
 configure:5803: result: yes
 configure:5803: checking for select
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
 configure:5803: $? = 0
 configure:5803: result: yes
 configure:5803: checking for setlocale
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
 configure:5803: $? = 0
 configure:5803: result: yes
 configure:5803: checking for snprintf
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
-conftest.c:96: warning: conflicting types for built-in function 'snprintf'
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
+conftest.c:97: warning: conflicting types for built-in function 'snprintf'
 configure:5803: $? = 0
 configure:5803: result: yes
 configure:5803: checking for socket
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
 configure:5803: $? = 0
 configure:5803: result: yes
 configure:5803: checking for strchr
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
-conftest.c:98: warning: conflicting types for built-in function 'strchr'
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
+conftest.c:99: warning: conflicting types for built-in function 'strchr'
 configure:5803: $? = 0
 configure:5803: result: yes
 configure:5803: checking for strdup
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
-conftest.c:99: warning: conflicting types for built-in function 'strdup'
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
+conftest.c:100: warning: conflicting types for built-in function 'strdup'
 configure:5803: $? = 0
 configure:5803: result: yes
 configure:5803: checking for strerror
 configure:5803: result: yes
 configure:5803: checking for strftime
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
-conftest.c:101: warning: conflicting types for built-in function 'strftime'
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
+conftest.c:102: warning: conflicting types for built-in function 'strftime'
 configure:5803: $? = 0
 configure:5803: result: yes
 configure:5803: checking for strlcat
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
 configure:5803: $? = 0
 configure:5803: result: yes
 configure:5803: checking for strlcpy
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
 configure:5803: $? = 0
 configure:5803: result: yes
 configure:5803: checking for strptime
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
 configure:5803: $? = 0
 configure:5803: result: yes
 configure:5803: checking for strstr
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
-conftest.c:105: warning: conflicting types for built-in function 'strstr'
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
+conftest.c:106: warning: conflicting types for built-in function 'strstr'
 configure:5803: $? = 0
 configure:5803: result: yes
 configure:5803: checking for strtoul
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
 configure:5803: $? = 0
 configure:5803: result: yes
 configure:5803: checking for timegm
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
-/tmp/ccHB58uk.o: In function `main':
-conftest.c:(.text+0x4): undefined reference to `timegm'
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
+/tmp/ccg4VKyD.o: In function `main':
+conftest.c:(.text.main+0x4): undefined reference to `timegm'
 collect2: ld returned 1 exit status
 configure:5803: $? = 1
 configure: failed program was:
@@ -2465,6 +2526,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | #define HAVE_GETHOSTBYNAME_R_6_ARGS 1
 | #define HAVE_GMTIME_R 1
 | #define HAVE_LOCALTIME_R 1
@@ -2566,12 +2628,12 @@ configure: failed program was:
 | }
 configure:5803: result: no
 configure:5803: checking for tzset
-configure:5803: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c  1>&5
+configure:5803: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c  1>&5
 configure:5803: $? = 0
 configure:5803: result: yes
 configure:5814: checking for pcre_compile in -lpcre
-configure:5839: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c -lpcre   1>&5
-/home/n8fr8/dev/android/ndk/my-android-toolchain/bin/../lib/gcc/arm-linux-androideabi/4.4.3/../../../../arm-linux-androideabi/bin/ld: cannot find -lpcre
+configure:5839: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c -lpcre   1>&5
+/home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/../lib/gcc/arm-linux-androideabi/4.4.3/../../../../arm-linux-androideabi/bin/ld: cannot find -lpcre
 collect2: ld returned 1 exit status
 configure:5839: $? = 1
 configure: failed program was:
@@ -2597,6 +2659,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | #define HAVE_GETHOSTBYNAME_R_6_ARGS 1
 | #define HAVE_GMTIME_R 1
 | #define HAVE_LOCALTIME_R 1
@@ -2676,8 +2739,8 @@ configure: failed program was:
 | }
 configure:5848: result: no
 configure:5906: checking for regcomp in -lpcreposix
-configure:5931: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c -lpcreposix -lpcre  1>&5
-/home/n8fr8/dev/android/ndk/my-android-toolchain/bin/../lib/gcc/arm-linux-androideabi/4.4.3/../../../../arm-linux-androideabi/bin/ld: cannot find -lpcreposix
+configure:5931: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c -lpcreposix -lpcre  1>&5
+/home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/../lib/gcc/arm-linux-androideabi/4.4.3/../../../../arm-linux-androideabi/bin/ld: cannot find -lpcreposix
 collect2: ld returned 1 exit status
 configure:5931: $? = 1
 configure: failed program was:
@@ -2703,6 +2766,7 @@ configure: failed program was:
 | #define HAVE_INTTYPES_H 1
 | #define HAVE_STDINT_H 1
 | #define HAVE_UNISTD_H 1
+| #define FEATURE_PTHREAD 1
 | #define HAVE_GETHOSTBYNAME_R_6_ARGS 1
 | #define HAVE_GMTIME_R 1
 | #define HAVE_LOCALTIME_R 1
@@ -2782,7 +2846,7 @@ configure: failed program was:
 | }
 configure:5940: result: no
 configure:6153: checking for zlibVersion in -lz
-configure:6178: arm-linux-androideabi-gcc -o conftest -pipe -O2  --sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include -L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib conftest.c -lz   1>&5
+configure:6178: /home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -o conftest -pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os   -L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections conftest.c -lz   1>&5
 configure:6178: $? = 0
 configure:6187: result: yes
 configure:6222: WARNING: You are using the static PCRE code which is scheduled for removal, for details see:
@@ -2804,31 +2868,31 @@ generated by GNU Autoconf 2.68.  Invocation command line was
 
 on didactic
 
-config.status:931: creating GNUmakefile
-config.status:931: creating doc/source/ldp.dsl
-config.status:931: creating config.h
-config.status:1106: config.h is unchanged
+config.status:935: creating GNUmakefile
+config.status:935: creating doc/source/ldp.dsl
+config.status:935: creating config.h
+config.status:1110: config.h is unchanged
 
 ## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##
 
-ac_cv_build=i686-pc-linux-gnulibc1
+ac_cv_build=i686-pc-linux-gnu
 ac_cv_c_compiler_gnu=yes
 ac_cv_c_const=yes
 ac_cv_env_CC_set=set
-ac_cv_env_CC_value=arm-linux-androideabi-gcc
-ac_cv_env_CFLAGS_set=
-ac_cv_env_CFLAGS_value=
-ac_cv_env_CPPFLAGS_set=set
-ac_cv_env_CPPFLAGS_value='--sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include'
+ac_cv_env_CC_value='/home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm'
+ac_cv_env_CFLAGS_set=set
+ac_cv_env_CFLAGS_value='-DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os'
+ac_cv_env_CPPFLAGS_set=
+ac_cv_env_CPPFLAGS_value=
 ac_cv_env_CPP_set=
 ac_cv_env_CPP_value=
 ac_cv_env_LDFLAGS_set=set
-ac_cv_env_LDFLAGS_value='-L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib'
+ac_cv_env_LDFLAGS_value='-L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections'
 ac_cv_env_LIBS_set=
 ac_cv_env_LIBS_value=
-ac_cv_env_build_alias_set=set
+ac_cv_env_build_alias_set=
 ac_cv_env_build_alias_value=
 ac_cv_env_host_alias_set=set
 ac_cv_env_host_alias_value=arm-linux-eabi
@@ -2846,6 +2910,7 @@ ac_cv_func_gettimeofday=yes
 ac_cv_func_gmtime_r=yes
 ac_cv_func_inet_ntoa=yes
 ac_cv_func_localtime_r=yes
+ac_cv_func_malloc_0_nonnull=yes
 ac_cv_func_memchr=yes
 ac_cv_func_memmove=yes
 ac_cv_func_memset=yes
@@ -2908,8 +2973,8 @@ ac_cv_path_GREP=/bin/grep
 ac_cv_path_ID=/usr/bin/id
 ac_cv_path_install='/usr/bin/install -c'
 ac_cv_prog_AWK=mawk
-ac_cv_prog_CC=arm-linux-androideabi-gcc
-ac_cv_prog_CPP='arm-linux-androideabi-gcc -E'
+ac_cv_prog_CC='/home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm'
+ac_cv_prog_CPP='/home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -E'
 ac_cv_prog_GDB=yes
 ac_cv_prog_RPMBIN=rpm
 ac_cv_prog_cc_c89=
@@ -2934,11 +2999,11 @@ ac_cv_type_size_t=yes
 AMIGAOS_ONLY='#'
 AWK='mawk'
 BGROUPS='/usr/bin/groups'
-CC='arm-linux-androideabi-gcc'
-CFLAGS='-pipe -O2'
+CC='/home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm'
+CFLAGS='-pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os'
 CODE_STATUS='stable'
-CPP='arm-linux-androideabi-gcc -E'
-CPPFLAGS='--sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include'
+CPP='/home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm -E'
+CPPFLAGS=''
 DB2HTML='false'
 DEFS='-DHAVE_CONFIG_H'
 DKPREFIX='none'
@@ -2957,7 +3022,7 @@ INSTALL_PROGRAM='${INSTALL}'
 INSTALL_SCRIPT='${INSTALL}'
 JADEBIN='false'
 JADECAT=''
-LDFLAGS='-L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib'
+LDFLAGS='-L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections'
 LIBOBJS=''
 LIBS=' -lz'
 LN_S='ln -s'
@@ -2971,8 +3036,8 @@ PACKAGE_TARNAME=''
 PACKAGE_URL=''
 PACKAGE_VERSION=''
 PATH_SEPARATOR=':'
-PTHREAD_LIB='-lpthread'
-PTHREAD_ONLY='#'
+PTHREAD_LIB=''
+PTHREAD_ONLY=''
 RPMBIN='rpm'
 RPM_BASE='/home/n8fr8/rpmbuild'
 SET_MAKE=''
@@ -2989,10 +3054,10 @@ WDUMP=''
 WIN_ONLY='#'
 ac_ct_CC=''
 bindir='${exec_prefix}/bin'
-build='i686-pc-linux-gnulibc1'
+build='i686-pc-linux-gnu'
 build_alias=''
 build_cpu='i686'
-build_os='linux-gnulibc1'
+build_os='linux-gnu'
 build_vendor='pc'
 datadir='${datarootdir}'
 datarootdir='${prefix}/share'
@@ -3014,7 +3079,7 @@ localstatedir='${prefix}/var'
 mandir='${datarootdir}/man'
 oldincludedir='/usr/include'
 pdfdir='${docdir}'
-prefix='/home/n8fr8/dev/android/ndk/my-android-toolchain'
+prefix='/usr/local'
 program_transform_name='s,x,x,'
 psdir='${docdir}'
 sbindir='${exec_prefix}/sbin'
@@ -3048,6 +3113,7 @@ target_alias=''
 #define HAVE_INTTYPES_H 1
 #define HAVE_STDINT_H 1
 #define HAVE_UNISTD_H 1
+#define FEATURE_PTHREAD 1
 #define HAVE_GETHOSTBYNAME_R_6_ARGS 1
 #define HAVE_GMTIME_R 1
 #define HAVE_LOCALTIME_R 1
@@ -3120,6 +3186,7 @@ target_alias=''
 #define FEATURE_CGI_EDIT_ACTIONS 1
 #define FEATURE_ZLIB 1
 #define STATIC_PCRE 1
+#define FEATURE_CONNECTION_KEEP_ALIVE 1
 #define STATIC_PCRS 1
 
 configure: exit 0
diff --git a/external/privoxy/config.status b/external/privoxy/config.status
index a3adb80..c2a9f33 100755
--- a/external/privoxy/config.status
+++ b/external/privoxy/config.status
@@ -435,7 +435,7 @@ $config_headers
 
 Report bugs to the package provider."
 
-ac_cs_config="'--host=arm-linux-eabi' '--build=' '--prefix=/home/n8fr8/dev/android/ndk/my-android-toolchain' '--disable-pthread' 'build_alias=' 'host_alias=arm-linux-eabi' 'CC=arm-linux-androideabi-gcc' 'LDFLAGS=-L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib' 'CPPFLAGS=--sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include'"
+ac_cs_config="'--host=arm-linux-eabi' '--enable-pthread' 'host_alias=arm-linux-eabi' 'CC=/home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm' 'CFLAGS=-DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os' 'LDFLAGS=-L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections'"
 ac_cs_version="\
 config.status
 configured by ./configure, generated by GNU Autoconf 2.68,
@@ -445,7 +445,7 @@ Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
-ac_pwd='/home/n8fr8/dev/gp/repos/orbot/native/privoxy/privoxy-3.0.12-stable'
+ac_pwd='/home/n8fr8/dev/gp/repos/orbot/external/privoxy'
 srcdir='.'
 INSTALL='/usr/bin/install -c'
 AWK='mawk'
@@ -526,7 +526,7 @@ if $ac_cs_silent; then
 fi
 
 if $ac_cs_recheck; then
-  set X '/bin/bash' './configure'  '--host=arm-linux-eabi' '--build=' '--prefix=/home/n8fr8/dev/android/ndk/my-android-toolchain' '--disable-pthread' 'build_alias=' 'host_alias=arm-linux-eabi' 'CC=arm-linux-androideabi-gcc' 'LDFLAGS=-L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib' 'CPPFLAGS=--sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8fr8/dev/android/ndk/my-android-toolchain/include' $ac_configure_extra_args --no-create --no-recursion
+  set X '/bin/bash' './configure'  '--host=arm-linux-eabi' '--enable-pthread' 'host_alias=arm-linux-eabi' 'CC=/home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm' 'CFLAGS=-DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sections -ffunction-sections -Os' 'LDFLAGS=-L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections' $ac_configure_extra_args --no-create --no-recursion
   shift
   $as_echo "running CONFIG_SHELL=/bin/bash $*" >&6
   CONFIG_SHELL='/bin/bash'
@@ -617,13 +617,13 @@ echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 cat >>"$ac_tmp/subs1.awk" <<\_ACAWK &&
 S["LTLIBOBJS"]=""
 S["LIBOBJS"]=""
-S["PTHREAD_LIB"]="-lpthread"
+S["PTHREAD_LIB"]=""
 S["SPECIAL_CFLAGS"]=""
 S["STATIC_PCRS_ONLY"]=""
 S["STATIC_PCRE_ONLY"]=""
 S["AMIGAOS_ONLY"]="#"
 S["SOCKET_LIB"]=""
-S["PTHREAD_ONLY"]="#"
+S["PTHREAD_ONLY"]=""
 S["EGREP"]="/bin/grep -E"
 S["GREP"]="/bin/grep"
 S["DKPREFIX"]="none"
@@ -647,15 +647,17 @@ S["LN_S"]="ln -s"
 S["INSTALL_DATA"]="${INSTALL} -m 644"
 S["INSTALL_SCRIPT"]="${INSTALL}"
 S["INSTALL_PROGRAM"]="${INSTALL}"
-S["CPP"]="arm-linux-androideabi-gcc -E"
+S["CPP"]="/home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/androi"\
+"d/ndk/platforms/android-8/arch-arm -E"
 S["OBJEXT"]="o"
 S["EXEEXT"]=""
 S["ac_ct_CC"]=""
-S["CPPFLAGS"]="--sysroot=/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot -I/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/include -I/home/n8"\
-"fr8/dev/android/ndk/my-android-toolchain/include"
-S["LDFLAGS"]="-L/home/n8fr8/dev/android/ndk/my-android-toolchain/sysroot/usr/lib -L/home/n8fr8/dev/android/ndk/my-android-toolchain/lib"
-S["CFLAGS"]="-pipe -O2"
-S["CC"]="arm-linux-androideabi-gcc"
+S["CPPFLAGS"]=""
+S["LDFLAGS"]="-L/home/n8fr8/dev/gp/repos/orbot/external/lib -L/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/lib -Wl,--gc-sections"
+S["CFLAGS"]="-pipe -DANDROID -I/home/n8fr8/dev/gp/repos/orbot/external/include -I/home/n8fr8/dev/android/ndk/platforms/android-8/arch-arm/usr/include -fdata-sect"\
+"ions -ffunction-sections -Os"
+S["CC"]="/home/n8fr8/dev/android/ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot=/home/n8fr8/dev/androi"\
+"d/ndk/platforms/android-8/arch-arm"
 S["CODE_STATUS"]="stable"
 S["VERSION_POINT"]="12"
 S["VERSION_MINOR"]="0"
@@ -664,10 +666,10 @@ S["host_os"]="eabi"
 S["host_vendor"]="linux"
 S["host_cpu"]="arm"
 S["host"]="arm-linux-eabi"
-S["build_os"]="linux-gnulibc1"
+S["build_os"]="linux-gnu"
 S["build_vendor"]="pc"
 S["build_cpu"]="i686"
-S["build"]="i686-pc-linux-gnulibc1"
+S["build"]="i686-pc-linux-gnu"
 S["target_alias"]=""
 S["host_alias"]="arm-linux-eabi"
 S["build_alias"]=""
@@ -696,7 +698,7 @@ S["libexecdir"]="${exec_prefix}/libexec"
 S["sbindir"]="${exec_prefix}/sbin"
 S["bindir"]="${exec_prefix}/bin"
 S["program_transform_name"]="s,x,x,"
-S["prefix"]="/home/n8fr8/dev/android/ndk/my-android-toolchain"
+S["prefix"]="/usr/local"
 S["exec_prefix"]="${prefix}"
 S["PACKAGE_URL"]=""
 S["PACKAGE_BUGREPORT"]=""
@@ -768,6 +770,7 @@ D["HAVE_STRINGS_H"]=" 1"
 D["HAVE_INTTYPES_H"]=" 1"
 D["HAVE_STDINT_H"]=" 1"
 D["HAVE_UNISTD_H"]=" 1"
+D["FEATURE_PTHREAD"]=" 1"
 D["HAVE_GETHOSTBYNAME_R_6_ARGS"]=" 1"
 D["HAVE_GMTIME_R"]=" 1"
 D["HAVE_LOCALTIME_R"]=" 1"
@@ -840,6 +843,7 @@ D["FEATURE_TRUST"]=" 1"
 D["FEATURE_CGI_EDIT_ACTIONS"]=" 1"
 D["FEATURE_ZLIB"]=" 1"
 D["STATIC_PCRE"]=" 1"
+D["FEATURE_CONNECTION_KEEP_ALIVE"]=" 1"
 D["STATIC_PCRS"]=" 1"
   for (key in D) D_is_set[key] = 1
   FS = ""
diff --git a/external/privoxy/config.sub b/external/privoxy/config.sub
index de5d6a7..c894da4 100644
--- a/external/privoxy/config.sub
+++ b/external/privoxy/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2008-02-05'
+timestamp='2012-02-10'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,9 +21,7 @@ timestamp='2008-02-05'
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -32,13 +30,16 @@ timestamp='2008-02-05'
 
 
 # Please send patches to <config-patches at gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -72,8 +73,9 @@ Report bugs and patches to <config-patches at gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -120,12 +122,18 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -148,10 +156,13 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis | -knuth | -cray | -microblaze)
 		os=
 		basic_machine=$1
 		;;
+	-bluegene*)
+		os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -166,10 +177,10 @@ case $os in
 		os=-chorusos
 		basic_machine=$1
 		;;
- 	-chorusrdb)
- 		os=-chorusrdb
+	-chorusrdb)
+		os=-chorusrdb
 		basic_machine=$1
- 		;;
+		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -238,19 +249,25 @@ case $basic_machine in
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
+	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+        | be32 | be64 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| le32 | le64 \
+	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep \
+	| maxq | mb | microblaze | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -270,29 +287,42 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| moxie \
 	| mt \
 	| msp430 \
+	| nds32 | nds32le | nds32be \
 	| nios | nios2 \
 	| ns16k | ns32k \
+	| open8 \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
+	| rl78 | rx \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
+	| x86 | xc16x | xstormy16 | xtensa \
+	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -302,6 +332,21 @@ case $basic_machine in
 		basic_machine=mt-unknown
 		;;
 
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -316,24 +361,29 @@ case $basic_machine in
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
+	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
+	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -355,27 +405,32 @@ case $basic_machine in
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
 	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
 	| tron-* \
-	| v850-* | v850e-* | vax-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
-	| z8k-*)
+	| z8k-* | z80-*)
 		;;
 	# Recognize the basic CPU types without company name, with glob match.
 	xtensa*)
@@ -397,7 +452,7 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
+	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -443,6 +498,10 @@ case $basic_machine in
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -459,10 +518,27 @@ case $basic_machine in
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
+	cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -491,7 +567,7 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16)
+	cr16 | cr16-*)
 		basic_machine=cr16-unknown
 		os=-elf
 		;;
@@ -530,6 +606,10 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
 	djgpp)
 		basic_machine=i586-pc
 		os=-msdosdjgpp
@@ -645,7 +725,6 @@ case $basic_machine in
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -703,6 +782,9 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+	microblaze)
+		basic_machine=microblaze-xilinx
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@@ -739,10 +821,18 @@ case $basic_machine in
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
+	msys)
+		basic_machine=i386-pc
+		os=-msys
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -807,6 +897,12 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -889,9 +985,10 @@ case $basic_machine in
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc)	basic_machine=powerpc-unknown
+	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@@ -985,6 +1082,9 @@ case $basic_machine in
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -1041,20 +1141,8 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
 	tile*)
-		basic_machine=tile-unknown
+		basic_machine=$basic_machine-unknown
 		os=-linux-gnu
 		;;
 	tx39)
@@ -1124,6 +1212,9 @@ case $basic_machine in
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@@ -1132,6 +1223,10 @@ case $basic_machine in
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1170,7 +1265,7 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@@ -1217,9 +1312,12 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+	# First match some system type aliases
+	# that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
+	-auroraux)
+		os=-auroraux
+		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1240,10 +1338,11 @@ case $os in
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
+	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1252,9 +1351,10 @@ case $os in
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1262,7 +1362,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1301,7 +1401,7 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
+	-os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1350,7 +1450,7 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
+	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1392,6 +1492,11 @@ case $os in
 	-zvmoe)
 		os=-zvmoe
 		;;
+	-dicos*)
+		os=-dicos
+		;;
+	-nacl*)
+		;;
 	-none)
 		;;
 	*)
@@ -1414,10 +1519,10 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
-        score-*)
+	score-*)
 		os=-elf
 		;;
-        spu-*)
+	spu-*)
 		os=-elf
 		;;
 	*-acorn)
@@ -1429,8 +1534,17 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1450,14 +1564,11 @@ case $basic_machine in
 		;;
 	m68000-sun)
 		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
+	mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
@@ -1484,7 +1595,7 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
+	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)
@@ -1589,7 +1700,7 @@ case $basic_machine in
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)
diff --git a/external/privoxy/configure b/external/privoxy/configure
index f7c38c9..a9e76f6 100755
--- a/external/privoxy/configure
+++ b/external/privoxy/configure
@@ -3994,7 +3994,7 @@ else
     echo "Using Cygnus (Win32 command line)"
   else
     SPECIAL_CFLAGS=
-    PTHREAD_LIB=-lpthread
+    #PTHREAD_LIB=-lpthread
   fi
 fi
 





More information about the tor-commits mailing list