Remove obsolete GCC 4.4.3 toolchain.

This remove the 4.4.3 toolchain from the NDK, and slightly
updates documentation to not mention it anymore.

Change-Id: Ia42cd54e3a4e88ba5ee3ea35d9ee3cc4b9237ca2

22 files changed, 32 insertions, 397 deletions

diff --git a/build/core/init.mk b/build/core/init.mk
index 9a945f286..45ac16c04 100644
--- a/build/core/init.mk
+++ b/build/core/init.mk
@@ -506,7 +506,7 @@ $(call ndk_log,Found max platform level: $(NDK_MAX_PLATFORM_LEVEL))
 # in build/toolchains/<name>/ that will be included here.
 #
 # Each one of these files should define the following variables:
-#   TOOLCHAIN_NAME   toolchain name (e.g. arm-linux-androideabi-4.4.3)
+#   TOOLCHAIN_NAME   toolchain name (e.g. arm-linux-androideabi-4.6)
 #   TOOLCHAIN_ABIS   list of target ABIs supported by the toolchain.
 #
 # Then, it should include $(ADD_TOOLCHAIN) which will perform
@@ -564,13 +564,13 @@ endif
 # version number. Unlike NDK_TOOLCHAIN, this only changes the suffix of
 # the toolchain path we're using.
 #
-# For example, if GCC 4.6 is the default, defining NDK_TOOLCHAIN_VERSION=4.4.3
+# For example, if GCC 4.6 is the default, defining NDK_TOOLCHAIN_VERSION=4.7
 # will ensure that ndk-build uses the following toolchains, depending on
 # the target architecture:
 #
-#    arm -> arm-linux-androideabi-4.4.3
-#    x86 -> x86-android-linux-4.4.3
-#    mips -> mipsel-linux-android-4.4.3
+#    arm -> arm-linux-androideabi-4.7
+#    x86 -> x86-android-linux-4.7
+#    mips -> mipsel-linux-android-4.7
 #
 # This is used in setup-toolchain.mk
 #
diff --git a/build/tools/DEV-SCRIPTS-USAGE.TXT b/build/tools/DEV-SCRIPTS-USAGE.TXT
index b0a4c7fa5..3f0f5d845 100644
--- a/build/tools/DEV-SCRIPTS-USAGE.TXT
+++ b/build/tools/DEV-SCRIPTS-USAGE.TXT
@@ -282,7 +282,7 @@ to verify that the patches apply cleanly.
 
 The toolchains binaries are typically placed under the directory
 $NDK/toolchains/$NAME/prebuilt/$SYSTEM, where $NAME is the toolchain name's
-full name (e.g. arm-linux-androideabi-4.4.3), and $SYSTEM is the name of the
+full name (e.g. arm-linux-androideabi-4.6), and $SYSTEM is the name of the
 host system it is meant to run on (e.g. 'linux-x86', 'windows' or 'darwin-x86')
 
 
@@ -311,8 +311,8 @@ For example, to rebuild the arm and x86 prebuilt toolchain binaries in the
 current NDK directory (which can be handy if you want to later use them to
 rebuild other target prebuilts or run tests), do:
 
-   $NDK/build/tools/build-gcc.sh /tmp/ndk-$USER/src $NDK arm-linux-androideabi-4.4.3
-   $NDK/build/tools/build-gcc.sh /tmp/ndk-$USER/src $NDK x86-4.4.3
+   $NDK/build/tools/build-gcc.sh /tmp/ndk-$USER/src $NDK arm-linux-androideabi-4.6
+   $NDK/build/tools/build-gcc.sh /tmp/ndk-$USER/src $NDK x86-4.6
 
 Here, we assume you downloaded the toolchain sources in /tmp/ndk-$USER/src
 as described in the previous section.
@@ -330,10 +330,10 @@ cross-toolchain (install it with "apt-get install mingw32" on Ubuntu). To do so
 use the "--mingw" option, as in:
 
     $NDK/build/tools/build-gcc.sh --mingw \
-        /tmp/ndk-$USER/src $NDK arm-linux-androideabi-4.4.3
+        /tmp/ndk-$USER/src $NDK arm-linux-androideabi-4.6
 
     $NDK/build/tools/build-gcc.sh --mingw \
-        /tmp/ndk-$USER/src $NDK x86-4.4.3
+        /tmp/ndk-$USER/src $NDK x86-4.6
 
 The corresponding binaries are installed under $NDK/toolchains/$NAME/prebuilt/windows
 Note that these are native Windows programs, not Cygwin ones.
@@ -383,8 +383,8 @@ The prebuilt binary is placed under $NDK/toolchains/$NAME/prebuilt/gdbserver
 in the final NDK installation. You can generate with 'build-gdbserver.sh' and
 takes the same parameters than 'build-gcc.sh'. So one can do:
 
-  $NDK/build/tools/build-gcc.sh  /tmp/ndk-$USER/src $NDK arm-linux-androideabi-4.4.3
-  $NDK/build/tools/build-gcc.sh  /tmp/ndk-$USER/src $NDK x86-4.4.3
+  $NDK/build/tools/build-gcc.sh  /tmp/ndk-$USER/src $NDK arm-linux-androideabi-4.6
+  $NDK/build/tools/build-gcc.sh  /tmp/ndk-$USER/src $NDK x86-4.6
 
 
 III.3. Generating C++ runtime prebuilt binaries:
diff --git a/build/tools/build-gcc.sh b/build/tools/build-gcc.sh
index 0a56a6125..6c0e3bb63 100755
--- a/build/tools/build-gcc.sh
+++ b/build/tools/build-gcc.sh
@@ -28,7 +28,7 @@ PROGRAM_DESCRIPTION=\
 
 Where <src-dir> is the location of toolchain sources, <ndk-dir> is
 the top-level NDK installation path and <toolchain> is the name of
-the toolchain to use (e.g. arm-linux-androideabi-4.4.3)."
+the toolchain to use (e.g. arm-linux-androideabi-4.6)."
 
 RELEASE=`date +%Y%m%d`
 BUILD_OUT=/tmp/ndk-$USER/build/toolchain
@@ -140,12 +140,14 @@ set_parameters ()
 
 set_parameters $PARAMETERS
 
-# Disable x86_64 build for toolchains older 4.7
+# Disable x86_64 build for toolchains older than 4.7
+# x86_64-* targets are available on 64-bit host only
 case "$TOOLCHAIN" in
   x86_64-4.4.3|x86_64-4.6)
     echo "ERROR: x86_64 toolchain is enabled in 4.7+. Please try to build newer version."
     exit 1
     ;;
+  x86_64-*) do_try64_option ;;
 esac
 
 prepare_target_build
@@ -325,6 +327,8 @@ case "$TOOLCHAIN" in
     ;;
     *-4.4.3)
     ;;
+    x86_64-4.7) # x32 support is included into gold 2.23, but 4.7 is based on 2.22, so stick it to bsd.
+    ;;
     *)
         EXTRA_CONFIG_FLAGS=$EXTRA_CONFIG_FLAGS" --enable-gold=default"
     ;;
diff --git a/build/tools/build-gdbserver.sh b/build/tools/build-gdbserver.sh
index 52e4bd2dc..18db73ec9 100755
--- a/build/tools/build-gdbserver.sh
+++ b/build/tools/build-gdbserver.sh
@@ -28,7 +28,7 @@ PROGRAM_DESCRIPTION=\
 
 Where <src-dir> is the location of the gdbserver sources,
 <ndk-dir> is the top-level NDK installation path and <toolchain>
-is the name of the toolchain to use (e.g. arm-linux-androideabi-4.4.3).
+is the name of the toolchain to use (e.g. arm-linux-androideabi-4.6).
 
 The final binary is placed under:
 
diff --git a/build/tools/build-host-gcc.sh b/build/tools/build-host-gcc.sh
index 73efd9ebc..fdc97f70e 100755
--- a/build/tools/build-host-gcc.sh
+++ b/build/tools/build-host-gcc.sh
@@ -169,7 +169,7 @@ extract_parameters "$@"
 
 TOOLCHAINS=$PARAMETERS
 if [ -z "$TOOLCHAINS" ]; then
-    TOOLCHAINS="arm-linux-androideabi-4.4.3,arm-linux-androideabi-4.6,x86-4.4.3,x86-4.6,mipsel-linux-android-4.4.3,mipsel-linux-android-4.6"
+    TOOLCHAINS="arm-linux-androideabi-4.6,x86-4.6,mipsel-linux-android-4.6"
     dump "Auto-config: $TOOLCHAINS"
 fi
 
@@ -379,7 +379,7 @@ extract_version ()
 # Given an input string of the form <foo>-<bar>-<version>, where
 # <version> can be <major>.<minor>, extract <major>
 #
-# $1: versioned name (e.g. arm-linux-androideabi-4.4.3)
+# $1: versioned name (e.g. arm-linux-androideabi-4.6)
 # Out: major version (e.g. 4)
 #
 # Examples:  arm-linux-androideabi-4.4.3 -> 4
diff --git a/build/tools/build-mingw64-toolchain.sh b/build/tools/build-mingw64-toolchain.sh
index 548169571..b065200e4 100755
--- a/build/tools/build-mingw64-toolchain.sh
+++ b/build/tools/build-mingw64-toolchain.sh
@@ -20,7 +20,7 @@
 #
 # GOOGLE_PREBUILT=<some folder>
 # git clone https://android.googlesource.com/platform/prebuilt $GOOGLE_PREBUILT
-# export PATH=$GOOGLE_PREBUILT/linux-x86/toolchain/i686-linux-glibc2.7-4.4.3/bin:$PATH
+# export PATH=$GOOGLE_PREBUILT/linux-x86/toolchain/i686-linux-glibc2.7-4.6/bin:$PATH
 # build-mingw64-toolchain.sh --target-arch=i686                       \
 #                            --package-dir=i686-w64-mingw32-toolchain \
 #                            --binprefix=i686-linux
diff --git a/build/tools/dev-defaults.sh b/build/tools/dev-defaults.sh
index f42786318..39754b350 100644
--- a/build/tools/dev-defaults.sh
+++ b/build/tools/dev-defaults.sh
@@ -36,7 +36,7 @@ COMPILER_RT_SUBDIR=sources/android/compiler-rt
 TOOLCHAIN_GIT_DATE=now
 
 # The space-separated list of all GCC versions we support in this NDK
-DEFAULT_GCC_VERSION_LIST="4.6 4.7 4.8 4.4.3"
+DEFAULT_GCC_VERSION_LIST="4.6 4.7 4.8"
 
 # The default GCC version for this NDK, i.e. the first item in
 # $DEFAULT_GCC_VERSION_LIST
@@ -168,7 +168,7 @@ get_default_toolchain_prefix_for_arch ()
 
 # Get the list of all toolchain names for a given architecture
 # $1: architecture (e.g. 'arm')
-# Out: list of toolchain names for this arch (e.g. arm-linux-androideabi-4.6 arm-linux-androideabi-4.4.3)
+# Out: list of toolchain names for this arch (e.g. arm-linux-androideabi-4.6 arm-linux-androideabi-4.7)
 # Return empty for unknown arch
 get_toolchain_name_list_for_arch ()
 {
diff --git a/build/tools/download-toolchain-sources.sh b/build/tools/download-toolchain-sources.sh
index 502ccd10b..281f5ef10 100755
--- a/build/tools/download-toolchain-sources.sh
+++ b/build/tools/download-toolchain-sources.sh
@@ -156,7 +156,7 @@ toolchain_clone ()
 # $1: sub-directory
 # $2: branch (e.g. 'master')
 # $3: repository/clone name (e.g. 'gcc')
-# $4+: sub-path to extract, relative to clone top-level (e.g. 'gcc-4.4.3')
+# $4+: sub-path to extract, relative to clone top-level (e.g. 'gcc-4.6')
 #
 toolchain_checkout ()
 {
@@ -215,7 +215,7 @@ toolchain_checkout "" $BRANCH isl .
 toolchain_checkout "" $BRANCH ppl .
 toolchain_checkout "" $BRANCH expat .
 toolchain_checkout "" $BRANCH binutils binutils-2.19 binutils-2.21 binutils-2.22 binutils-2.23
-toolchain_checkout "" $BRANCH gcc gcc-4.4.3 gcc-4.6 gcc-4.7 gcc-4.8
+toolchain_checkout "" $BRANCH gcc gcc-4.6 gcc-4.7 gcc-4.8
 toolchain_checkout "" $BRANCH gdb gdb-7.3.x gdb-7.6
 toolchain_checkout "" $BRANCH python Python-2.7.5
 toolchain_checkout "" $BRANCH perl perl-5.16.2
diff --git a/build/tools/package-release.sh b/build/tools/package-release.sh
index c6d121890..bada1b28f 100755
--- a/build/tools/package-release.sh
+++ b/build/tools/package-release.sh
@@ -154,7 +154,7 @@ done
 # Convert comma-separated list to space-separated list
 LLVM_VERSION_LIST=$(commas_to_spaces $LLVM_VERSION_LIST)
 
-# If --arch is used to list x86 as a target architecture, Add x86-4.4.3 to
+# If --arch is used to list x86 as a target architecture, Add x86-4.6 to
 # the list of default toolchains to package. That is, unless you also
 # explicitely use --toolchains=<list>
 #
diff --git a/build/tools/toolchain-patches/gcc/0001-Enable-C-exceptions-and-RTTI-by-default.patch b/build/tools/toolchain-patches/gcc/0001-Enable-C-exceptions-and-RTTI-by-default.patch
index 1bb9820b5..79aa56e99 100644
--- a/build/tools/toolchain-patches/gcc/0001-Enable-C-exceptions-and-RTTI-by-default.patch
+++ b/build/tools/toolchain-patches/gcc/0001-Enable-C-exceptions-and-RTTI-by-default.patch
@@ -6,25 +6,9 @@ Subject: Enable C++ exceptions and RTTI by default.
 With this change, -fexceptions and -frtti become default options
 when compiling C++ sources.
 ---
- gcc-4.4.3/gcc/config/linux-android.h |    4 ++--
  gcc-4.6/gcc/config/linux-android.h   |    4 ++--
  2 files changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/gcc-4.4.3/gcc/config/linux-android.h b/gcc-4.4.3/gcc/config/linux-android.h
-index 5ca3858..d938c22 100644
---- a/gcc-4.4.3/gcc/config/linux-android.h
-+++ b/gcc-4.4.3/gcc/config/linux-android.h
-@@ -46,8 +46,8 @@
-   "%{!fno-pic:%{!fno-PIC:%{!fpic:%{!fPIC: " ANDROID_PIC_DEFAULT "}}}}"
- 
- #define ANDROID_CC1PLUS_SPEC						\
--  "%{!fexceptions:%{!fno-exceptions: -fno-exceptions}} "		\
--  "%{!frtti:%{!fno-rtti: -fno-rtti}}"
-+  "%{!fexceptions:%{!fno-exceptions: -fexceptions}} "		\
-+  "%{!frtti:%{!fno-rtti: -frtti}}"
- 
- #define ANDROID_ASM_SPEC \
-   "--noexecstack"
 diff --git a/gcc-4.6/gcc/config/linux-android.h b/gcc-4.6/gcc/config/linux-android.h
 index 94c5274..7256082 100644
 --- a/gcc-4.6/gcc/config/linux-android.h
diff --git a/build/tools/toolchain-patches/gcc/0002-gcc-prevent-crash-on-Eclair-and-older-platforms.patch b/build/tools/toolchain-patches/gcc/0002-gcc-prevent-crash-on-Eclair-and-older-platforms.patch
index d4b4c9a0c..befa6a099 100644
--- a/build/tools/toolchain-patches/gcc/0002-gcc-prevent-crash-on-Eclair-and-older-platforms.patch
+++ b/build/tools/toolchain-patches/gcc/0002-gcc-prevent-crash-on-Eclair-and-older-platforms.patch
@@ -21,34 +21,9 @@ completely. And we don't need them because the pthread symbols
 are all in the C library on Android, unlike legacy Linux systems
 which put them in libpthread.so (and provide weak stubs in libc.so).
 ---
- gcc-4.4.3/gcc/gthr-posix.h |   13 +++++++++++++
  gcc-4.6/gcc/gthr-posix.h   |   13 +++++++++++++
  2 files changed, 26 insertions(+), 0 deletions(-)
 
-diff --git a/gcc-4.4.3/gcc/gthr-posix.h b/gcc-4.4.3/gcc/gthr-posix.h
-index 27652f9..a104d91 100644
---- a/gcc-4.4.3/gcc/gthr-posix.h
-+++ b/gcc-4.4.3/gcc/gthr-posix.h
-@@ -38,6 +38,19 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- #define _REENTRANT 1
- #endif
- 
-+/* The following should normally be in a different header file,
-+ * but I couldn't find the right location. The point of the macro
-+ * definition below is to prevent libsupc++ and libstdc++ to reference
-+ * weak symbols in their static C++ constructors. Such code crashes
-+ * when a shared object linked statically to these libraries is
-+ * loaded on Android 2.1 (Eclair) and older platform releases, due
-+ * to a dynamic linker bug.
-+ */
-+#ifdef __ANDROID__
-+#undef GTHREAD_USE_WEAK
-+#define GTHREAD_USE_WEAK 0
-+#endif
-+
- #include <pthread.h>
- #include <unistd.h>
- 
 diff --git a/gcc-4.6/gcc/gthr-posix.h b/gcc-4.6/gcc/gthr-posix.h
 index ecb06e2..8372c64 100644
 --- a/gcc-4.6/gcc/gthr-posix.h
diff --git a/build/tools/toolchain-patches/gcc/0006-Disable-libstdc-versioning.patch b/build/tools/toolchain-patches/gcc/0006-Disable-libstdc-versioning.patch
index 46ca5809a..d89fd149f 100644
--- a/build/tools/toolchain-patches/gcc/0006-Disable-libstdc-versioning.patch
+++ b/build/tools/toolchain-patches/gcc/0006-Disable-libstdc-versioning.patch
@@ -8,35 +8,10 @@ instead of libstdc++.so.3 (or some similar number-versioned name).
 
 Change-Id: I63fb5be818115c6d0c7e96b937ba39f225b475cf
 ---
- gcc-4.4.3/libstdc++-v3/src/Makefile.am |    2 +-
- gcc-4.4.3/libstdc++-v3/src/Makefile.in |    7 +++++--
  gcc-4.6/libstdc++-v3/src/Makefile.am   |    2 +-
  gcc-4.6/libstdc++-v3/src/Makefile.in   |    7 +++++--
  4 files changed, 12 insertions(+), 6 deletions(-)
 
-diff --git a/gcc-4.4.3/libstdc++-v3/src/Makefile.in b/gcc-4.4.3/libstdc++-v3/src/Makefile.in
-index 74bbdd4..f08bf34 100644
---- a/gcc-4.4.3/libstdc++-v3/src/Makefile.in
-+++ b/gcc-4.4.3/libstdc++-v3/src/Makefile.in
-@@ -350,7 +350,7 @@ WARN_CXXFLAGS = \
- AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
- 
- # Cross compiler support.
--toolexeclib_LTLIBRARIES = libstdc++.la
-+toolexeclib_LTLIBRARIES = libgnustl_shared.la
- @ENABLE_SYMVERS_DARWIN_TRUE@@ENABLE_SYMVERS_TRUE@version_arg = -Wl,-exported_symbols_list,libstdc++-symbols.explist
- @ENABLE_SYMVERS_FALSE@version_arg = 
- @ENABLE_SYMVERS_GNU_NAMESPACE_TRUE@@ENABLE_SYMVERS_TRUE@version_arg = -Wl,--version-script=libstdc++-symbols.ver
-@@ -576,6 +576,9 @@ clean-toolexeclibLTLIBRARIES:
- libstdc++.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES) 
- 	$(CXXLINK) -rpath $(toolexeclibdir) $(libstdc___la_LDFLAGS) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS)
- 
-+libgnustl_shared.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES)
-+	$(CXXLINK) -rpath $(toolexeclibdir) $(libstdc___la_LDFLAGS) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS)
-+
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
- 
 diff --git a/gcc-4.6/libstdc++-v3/src/Makefile.in b/gcc-4.6/libstdc++-v3/src/Makefile.in
 index 146ec3f..99f0f56 100644
 --- a/gcc-4.6/libstdc++-v3/src/Makefile.in
diff --git a/docs/text/APPLICATION-MK.text b/docs/text/APPLICATION-MK.text
index df8694822..61c144f5b 100644
--- a/docs/text/APPLICATION-MK.text
+++ b/docs/text/APPLICATION-MK.text
@@ -246,8 +246,8 @@ APP_SHORT_COMMANDS
 
 - - - -
 NDK_TOOLCHAIN_VERSION
->    Define this variable to either 4.4.3 or 4.6 to select version of GCC compiler.
->    4.6 is the default
+>    Define this variable to either 4.6, 4.7 or 4.8 to select version of
+>    the GCC compiler. 4.6 is the default
 
 - - - -
 APP_PIE
diff --git a/docs/text/DEVELOPMENT.text b/docs/text/DEVELOPMENT.text
index 5773b3be4..7e1fd4dc3 100644
--- a/docs/text/DEVELOPMENT.text
+++ b/docs/text/DEVELOPMENT.text
@@ -174,7 +174,7 @@ and place them in a directory named:
 These binary packages include the following:
 
   - host-specific toolchain binaries. e.g.
-    `arm-linux-androideabi-4.4.3-linux-x86.tar.bz2`.
+    `arm-linux-androideabi-4.6-linux-x86.tar.bz2`.
 
   - toolchain specific device binaries, e.g.
     `arm-gdbserver.tar.bz2`.
diff --git a/docs/text/STANDALONE-TOOLCHAIN.text b/docs/text/STANDALONE-TOOLCHAIN.text
index c8e0e8584..d2cc58ea0 100644
--- a/docs/text/STANDALONE-TOOLCHAIN.text
+++ b/docs/text/STANDALONE-TOOLCHAIN.text
@@ -85,7 +85,7 @@ Use the '--arch=x86' option to specify the x86 GCC 4.6, or add '--arch=mips' opt
 to specify the MIPS GCC 4.6, or alternatively
 '--toolchain=<name>'.  For example:
 
-        --toolchain=x86-4.4.3                  # select x86 GCC 4.4.3 compiler
+        --toolchain=x86-4.8                    # select x86 GCC 4.8 compiler
         --toolchain=arm-linux-androideabi-4.7  # select ARM GCC 4.7 compiler
         --toolchain=mipsel-linux-android-4.6   # select MIPS GCC 4.6 compiler, same as --arch=mips
 
diff --git a/tests/standalone/run.sh b/tests/standalone/run.sh
index 45b4867c7..4268f3325 100755
--- a/tests/standalone/run.sh
+++ b/tests/standalone/run.sh
@@ -102,7 +102,7 @@ if [ "$HELP" ]; then
     echo "option, or by defining PREFIX in your environment before calling this script."
     echo "For example:"
     echo ""
-    echo "  $PROGNAME --prefix=\$NDK/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi"
+    echo "  $PROGNAME --prefix=\$NDK/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin/arm-linux-androideabi"
     echo ""
     echo "The prefix can also be the full-path to the \$TARGET-gcc or \$TARGET-g++ program "
     echo ""
diff --git a/toolchains/arm-linux-androideabi-4.4.3/config.mk b/toolchains/arm-linux-androideabi-4.4.3/config.mk
deleted file mode 100644
index 2547cd409..000000000
--- a/toolchains/arm-linux-androideabi-4.4.3/config.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# config file for the arm gcc-4.4.3 toolchain for the Android NDK
-# the real meat is in the setup.mk file adjacent to this one
-#
-TOOLCHAIN_ARCH := arm
-TOOLCHAIN_ABIS := armeabi armeabi-v7a
diff --git a/toolchains/arm-linux-androideabi-4.4.3/setup.mk b/toolchains/arm-linux-androideabi-4.4.3/setup.mk
deleted file mode 100644
index 76dbddf1b..000000000
--- a/toolchains/arm-linux-androideabi-4.4.3/setup.mk
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# this file is used to prepare the NDK to build with the arm gcc-4.4.3
-# toolchain any number of source files
-#
-# its purpose is to define (or re-define) templates used to build
-# various sources into target object files, libraries or executables.
-#
-# Note that this file may end up being parsed several times in future
-# revisions of the NDK.
-#
-
-TARGET_CFLAGS := \
-    -fpic \
-    -ffunction-sections \
-    -funwind-tables \
-    -fstack-protector
-
-TARGET_LDFLAGS :=
-
-TARGET_C_INCLUDES := \
-    $(SYSROOT_INC)/usr/include
-
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-    TARGET_CFLAGS += -march=armv7-a \
-                     -mfloat-abi=softfp \
-                     -mfpu=vfpv3-d16
-
-    TARGET_LDFLAGS += -march=armv7-a \
-                     -Wl,--fix-cortex-a8
-else
-    TARGET_CFLAGS += -march=armv5te \
-                            -mtune=xscale \
-                            -msoft-float
-endif
-
-TARGET_CFLAGS.neon := -mfpu=neon
-
-TARGET_arm_release_CFLAGS :=  -O2 \
-                              -g \
-                              -DNDEBUG \
-                              -fomit-frame-pointer \
-                              -fstrict-aliasing    \
-                              -funswitch-loops     \
-                              -finline-limit=300
-
-TARGET_thumb_release_CFLAGS := -mthumb \
-                               -Os \
-                               -g \
-                               -DNDEBUG \
-                               -fomit-frame-pointer \
-                               -fno-strict-aliasing \
-                               -finline-limit=64
-
-# When building for debug, compile everything as arm.
-TARGET_arm_debug_CFLAGS := $(TARGET_arm_release_CFLAGS) \
-                           -O0 \
-                           -UNDEBUG \
-                           -fno-omit-frame-pointer \
-                           -fno-strict-aliasing
-
-TARGET_thumb_debug_CFLAGS := $(TARGET_thumb_release_CFLAGS) \
-                             -O0 \
-                             -UNDEBUG \
-                             -marm \
-                             -fno-omit-frame-pointer
-
-# This function will be called to determine the target CFLAGS used to build
-# a C or Assembler source file, based on its tags.
-#
-TARGET-process-src-files-tags = \
-$(eval __arm_sources := $(call get-src-files-with-tag,arm)) \
-$(eval __thumb_sources := $(call get-src-files-without-tag,arm)) \
-$(eval __debug_sources := $(call get-src-files-with-tag,debug)) \
-$(eval __release_sources := $(call get-src-files-without-tag,debug)) \
-$(call set-src-files-target-cflags, \
-    $(call set_intersection,$(__arm_sources),$(__debug_sources)), \
-    $(TARGET_arm_debug_CFLAGS)) \
-$(call set-src-files-target-cflags,\
-    $(call set_intersection,$(__arm_sources),$(__release_sources)),\
-    $(TARGET_arm_release_CFLAGS)) \
-$(call set-src-files-target-cflags,\
-    $(call set_intersection,$(__arm_sources),$(__debug_sources)),\
-    $(TARGET_arm_debug_CFLAGS)) \
-$(call set-src-files-target-cflags,\
-    $(call set_intersection,$(__thumb_sources),$(__release_sources)),\
-    $(TARGET_thumb_release_CFLAGS)) \
-$(call set-src-files-target-cflags,\
-    $(call set_intersection,$(__thumb_sources),$(__debug_sources)),\
-    $(TARGET_thumb_debug_CFLAGS)) \
-$(call add-src-files-target-cflags,\
-    $(call get-src-files-with-tag,neon),\
-    $(TARGET_CFLAGS.neon)) \
-$(call set-src-files-text,$(__arm_sources),arm$(space)$(space)) \
-$(call set-src-files-text,$(__thumb_sources),thumb)
diff --git a/toolchains/mipsel-linux-android-4.4.3/config.mk b/toolchains/mipsel-linux-android-4.4.3/config.mk
deleted file mode 100644
index b4dbc326c..000000000
--- a/toolchains/mipsel-linux-android-4.4.3/config.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# config file for the mipsel gcc-4.4.3 toolchain for the Android NDK
-# the real meat is in the setup.mk file adjacent to this one
-#
-TOOLCHAIN_ARCH := mips
-TOOLCHAIN_ABIS := mips
diff --git a/toolchains/mipsel-linux-android-4.4.3/setup.mk b/toolchains/mipsel-linux-android-4.4.3/setup.mk
deleted file mode 100644
index c4c61b906..000000000
--- a/toolchains/mipsel-linux-android-4.4.3/setup.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# this file is used to prepare the NDK to build with the mipsel gcc-4.4.3
-# toolchain any number of source files
-#
-# its purpose is to define (or re-define) templates used to build
-# various sources into target object files, libraries or executables.
-#
-# Note that this file may end up being parsed several times in future
-# revisions of the NDK.
-#
-
-TARGET_CFLAGS := \
-        -fpic \
-        -fno-strict-aliasing \
-        -finline-functions \
-        -ffunction-sections \
-        -funwind-tables \
-        -fmessage-length=0 \
-        -fno-inline-functions-called-once \
-        -fgcse-after-reload \
-        -frerun-cse-after-loop \
-        -frename-registers \
-
-TARGET_LDFLAGS :=
-
-TARGET_C_INCLUDES := \
-    $(SYSROOT_INC)/usr/include
-
-TARGET_mips_release_CFLAGS := -O2 \
-                              -g \
-                              -DNDEBUG \
-                              -fomit-frame-pointer \
-                              -funswitch-loops     \
-                              -finline-limit=300
-
-TARGET_mips_debug_CFLAGS := -O0 \
-                            -g \
-                            -fno-omit-frame-pointer
-
-
-# This function will be called to determine the target CFLAGS used to build
-# a C or Assembler source file, based on its tags.
-TARGET-process-src-files-tags = \
-$(eval __debug_sources := $(call get-src-files-with-tag,debug)) \
-$(eval __release_sources := $(call get-src-files-without-tag,debug)) \
-$(call set-src-files-target-cflags, \
-    $(__debug_sources),\
-    $(TARGET_mips_debug_CFLAGS)) \
-$(call set-src-files-target-cflags,\
-    $(__release_sources),\
-    $(TARGET_mips_release_CFLAGS)) \
-$(call set-src-files-text,$(__debug_sources),mips$(space)) \
-$(call set-src-files-text,$(__release_sources),mips$(space)) \
diff --git a/toolchains/x86-4.4.3/config.mk b/toolchains/x86-4.4.3/config.mk
deleted file mode 100644
index de7c84c60..000000000
--- a/toolchains/x86-4.4.3/config.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# config file for the x86 gcc-4.4.3 toolchain for the Android NDK
-# the real meat is in the setup.mk file adjacent to this one
-#
-TOOLCHAIN_ARCH := x86
-TOOLCHAIN_ABIS := x86
diff --git a/toolchains/x86-4.4.3/setup.mk b/toolchains/x86-4.4.3/setup.mk
deleted file mode 100644
index 32beac6ed..000000000
--- a/toolchains/x86-4.4.3/setup.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (C) 2009 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# this file is used to prepare the NDK to build with the x86 gcc-4.4.3
-# toolchain any number of source files
-#
-# its purpose is to define (or re-define) templates used to build
-# various sources into target object files, libraries or executables.
-#
-# Note that this file may end up being parsed several times in future
-# revisions of the NDK.
-#
-
-TOOLCHAIN_NAME   := x86-4.4.3
-TOOLCHAIN_PREFIX := $(TOOLCHAIN_PREBUILT_ROOT)/bin/i686-linux-android-
-
-TARGET_CFLAGS := \
-    -ffunction-sections \
-    -funwind-tables
-
-TARGET_C_INCLUDES := \
-    $(SYSROOT_INC)/usr/include
-
-# Add and LDFLAGS for the target here
-# TARGET_LDFLAGS :=
-
-TARGET_CFLAGS += -fstack-protector
-
-TARGET_x86_release_CFLAGS := -O2 \
-                             -g \
-                             -DNDEBUG \
-                             -fomit-frame-pointer \
-                             -fstrict-aliasing    \
-                             -funswitch-loops     \
-                             -finline-limit=300
-
-# When building for debug, compile everything as x86.
-TARGET_x86_debug_CFLAGS := $(TARGET_x86_release_CFLAGS) \
-                           -O0 \
-                           -UNDEBUG \
-                           -fno-omit-frame-pointer \
-                           -fno-strict-aliasing
-
-# This function will be called to determine the target CFLAGS used to build
-# a C or Assembler source file, based on its tags.
-#
-TARGET-process-src-files-tags = \
-$(eval __debug_sources := $(call get-src-files-with-tag,debug)) \
-$(eval __release_sources := $(call get-src-files-without-tag,debug)) \
-$(call set-src-files-target-cflags, $(__debug_sources), $(TARGET_x86_debug_CFLAGS)) \
-$(call set-src-files-target-cflags, $(__release_sources),$(TARGET_x86_release_CFLAGS)) \
-$(call set-src-files-text,$(LOCAL_SRC_FILES),x86$(space)$(space)) \
-
-# The ABI-specific sub-directory that the SDK tools recognize for
-# this toolchain's generated binaries
-TARGET_ABI_SUBDIR := x86