Remove GCC 4.6

Change-Id: I840e7a2183e956e27e5dd93357ef2a2dd49fd40b

5 files changed, 1 insertions, 95 deletions

diff --git a/build/tools/toolchain-patches/gcc/0001-Disable-sincos-optimization.patch b/build/tools/toolchain-patches/gcc/0001-Disable-sincos-optimization.patch
index 5aa35f0af..78077dfcf 100644
--- a/build/tools/toolchain-patches/gcc/0001-Disable-sincos-optimization.patch
+++ b/build/tools/toolchain-patches/gcc/0001-Disable-sincos-optimization.patch
@@ -1,7 +1,7 @@
 From 504ba0176a97c9b849fd18c4591a2cfc8d5eb130 Mon Sep 17 00:00:00 2001
 From: David 'Digit' Turner <digit@google.com>
 Date: Wed, 9 May 2012 17:53:13 +0200
-Subject: gcc-4.6: Disable sincos optimization
+Subject: gcc-4.8: Disable sincos optimization
 
 Ensure that sincos optimization is disabled for NDK toolchain
 builds. This ensures that NDK-generated code will always link
@@ -21,23 +21,9 @@ Into machine code that does:
 
 Change-Id: I332bf5788267dd56e93b8cdb0cefa04b970eca88
 ---
- gcc-4.6/gcc/config/linux.h | 2 +-
  gcc-4.8/gcc/config/linux.h | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/gcc-4.6/gcc/config/linux.h b/gcc-4.6/gcc/config/linux.h
-index 4e21112..025157f 100644
---- a/gcc-4.6/gcc/config/linux.h
-+++ b/gcc-4.6/gcc/config/linux.h
-@@ -99,7 +99,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- #define TARGET_C99_FUNCTIONS (OPTION_GLIBC)
- 
- /* Whether we have sincos that follows the GNU extension.  */
--#define TARGET_HAS_SINCOS (OPTION_GLIBC || OPTION_BIONIC)
-+#define TARGET_HAS_SINCOS (OPTION_GLIBC)
- 
- /* Whether we have Bionic libc runtime */
- #undef TARGET_HAS_BIONIC
 diff --git a/gcc-4.8/gcc/config/linux.h b/gcc-4.8/gcc/config/linux.h
 index 2be1079..b83dc08 100644
 --- a/gcc-4.8/gcc/config/linux.h
diff --git a/build/tools/toolchain-patches/gcc/0002-Enable-C-exceptions-and-RTTI-by-default.patch b/build/tools/toolchain-patches/gcc/0002-Enable-C-exceptions-and-RTTI-by-default.patch
index 57324bfba..f74d07284 100644
--- a/build/tools/toolchain-patches/gcc/0002-Enable-C-exceptions-and-RTTI-by-default.patch
+++ b/build/tools/toolchain-patches/gcc/0002-Enable-C-exceptions-and-RTTI-by-default.patch
@@ -6,26 +6,10 @@ Subject: Enable C++ exceptions and RTTI by default.
 With this change, -fexceptions and -frtti become default options
 when compiling C++ sources.
 ---
- gcc-4.6/gcc/config/linux-android.h | 4 ++--
  gcc-4.8/gcc/config/linux-android.h | 4 ++--
  gcc-4.9/gcc/config/linux-android.h | 4 ++--
  3 files changed, 6 insertions(+), 6 deletions(-)
 
-diff --git a/gcc-4.6/gcc/config/linux-android.h b/gcc-4.6/gcc/config/linux-android.h
-index c19b1c1..6fa4f53 100644
---- a/gcc-4.6/gcc/config/linux-android.h
-+++ b/gcc-4.6/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.8/gcc/config/linux-android.h b/gcc-4.8/gcc/config/linux-android.h
 index 87957e3..e88ab78 100644
 --- a/gcc-4.8/gcc/config/linux-android.h
diff --git a/build/tools/toolchain-patches/gcc/0003-gcc-prevent-crash-on-Eclair-and-older-platforms.patch b/build/tools/toolchain-patches/gcc/0003-gcc-prevent-crash-on-Eclair-and-older-platforms.patch
index b67cd977f..e55a6755d 100644
--- a/build/tools/toolchain-patches/gcc/0003-gcc-prevent-crash-on-Eclair-and-older-platforms.patch
+++ b/build/tools/toolchain-patches/gcc/0003-gcc-prevent-crash-on-Eclair-and-older-platforms.patch
@@ -21,35 +21,10 @@ 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.6/gcc/gthr-posix.h    | 13 +++++++++++++
  gcc-4.8/libgcc/gthr-posix.h | 13 +++++++++++++
  gcc-4.9/libgcc/gthr-posix.h | 13 +++++++++++++
  3 files changed, 39 insertions(+)
 
-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
-+++ b/gcc-4.6/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.8/libgcc/gthr-posix.h b/gcc-4.8/libgcc/gthr-posix.h
 index f0d8cd7..1d03af0 100644
 --- a/gcc-4.8/libgcc/gthr-posix.h
diff --git a/build/tools/toolchain-patches/gcc/0004-Rename-libstdc++.so-to-libgnustl_shared.so.patch b/build/tools/toolchain-patches/gcc/0004-Rename-libstdc++.so-to-libgnustl_shared.so.patch
index 25314de74..7e322d9ca 100644
--- a/build/tools/toolchain-patches/gcc/0004-Rename-libstdc++.so-to-libgnustl_shared.so.patch
+++ b/build/tools/toolchain-patches/gcc/0004-Rename-libstdc++.so-to-libgnustl_shared.so.patch
@@ -8,34 +8,10 @@ instead of libstdc++.so.3 (or some similar number-versioned name).
 
 Change-Id: I63fb5be818115c6d0c7e96b937ba39f225b475cf
 ---
- gcc-4.6/libstdc++-v3/src/Makefile.in | 5 ++++-
  gcc-4.8/libstdc++-v3/src/Makefile.in | 5 ++++-
  gcc-4.9/libstdc++-v3/src/Makefile.in | 5 ++++-
  3 files changed, 12 insertions(+), 3 deletions(-)
 
-diff --git a/gcc-4.6/libstdc++-v3/src/Makefile.in b/gcc-4.6/libstdc++-v3/src/Makefile.in
-index d03acd5..5abd1d2 100644
---- a/gcc-4.6/libstdc++-v3/src/Makefile.in
-+++ b/gcc-4.6/libstdc++-v3/src/Makefile.in
-@@ -340,7 +340,7 @@ WARN_CXXFLAGS = \
- AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
- 
- # Cross compiler support.
--toolexeclib_LTLIBRARIES = libstdc++.la
-+toolexeclib_LTLIBRARIES = libgnustl_shared.la
- @ENABLE_SYMVERS_TRUE@CLEANFILES = libstdc++-symbols.ver $(version_dep)
- @ENABLE_SYMVERS_DARWIN_TRUE@@ENABLE_SYMVERS_TRUE@version_arg = -Wl,-exported_symbols_list,libstdc++-symbols.explist
- @ENABLE_SYMVERS_FALSE@version_arg = 
-@@ -596,6 +596,9 @@ clean-toolexeclibLTLIBRARIES:
- libstdc++.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES) 
- 	$(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS)
- 
-+libgnustl_shared.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES)
-+	$(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS)
-+
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
- 
 diff --git a/gcc-4.8/libstdc++-v3/src/Makefile.in b/gcc-4.8/libstdc++-v3/src/Makefile.in
 index 9721ebb..dd3d426 100644
 --- a/gcc-4.8/libstdc++-v3/src/Makefile.in
diff --git a/build/tools/toolchain-patches/gcc/0012-Don-t-define-__fp16-for-clang.patch b/build/tools/toolchain-patches/gcc/0012-Don-t-define-__fp16-for-clang.patch
index 0cf541e05..6e191fa40 100644
--- a/build/tools/toolchain-patches/gcc/0012-Don-t-define-__fp16-for-clang.patch
+++ b/build/tools/toolchain-patches/gcc/0012-Don-t-define-__fp16-for-clang.patch
@@ -5,25 +5,10 @@ Subject: [PATCH 2/2] Don't define __fp16 for clang
 
 Change-Id: Ie0131eb5d2158d678d82aaf3e46f78bf8fdd1c7a
 ---
- gcc-4.6/gcc/config/i386/arm_neon.h | 2 ++
  gcc-4.8/gcc/config/i386/arm_neon.h | 2 ++
  gcc-4.9/gcc/config/i386/arm_neon.h | 2 ++
  3 files changed, 6 insertions(+)
 
-diff --git a/gcc-4.6/gcc/config/i386/arm_neon.h b/gcc-4.6/gcc/config/i386/arm_neon.h
-index 5f56cbd..873b7d6 100644
---- a/gcc-4.6/gcc/config/i386/arm_neon.h
-+++ b/gcc-4.6/gcc/config/i386/arm_neon.h
-@@ -159,7 +159,9 @@ typedef unsigned long long uint64_t;
- #endif
- 
- typedef   float float32_t;
-+#if !defined(__clang__)
- typedef   float __fp16;
-+#endif
- 
- typedef  uint8_t poly8_t;
- typedef  uint16_t poly16_t;
 diff --git a/gcc-4.8/gcc/config/i386/arm_neon.h b/gcc-4.8/gcc/config/i386/arm_neon.h
 index 5f56cbd..873b7d6 100644
 --- a/gcc-4.8/gcc/config/i386/arm_neon.h