Update toolchain-patches

Update patches to apply toolchain source @ 2012-05-12, which includes

toolchain/build.git:
  https://android-review.googlesource.com/#/c/35566/
  https://android-review.googlesource.com/#/c/36112/
  https://android-review.googlesource.com/#/c/36451/
  https://android-review.googlesource.com/#/c/36421/
  https://android-review.googlesource.com/#/c/36454/

toolchain/binutils.git:
  https://android-review.googlesource.com/#/c/36417/

toolchain/gcc.git:
  https://android-review.googlesource.com/#/c/36286/

toolchain/gdb.git:
  https://android-review.googlesource.com/#/c/36423/

Removed redundant patches to gcc/gcc-4.6/gcc/config/i386/linux.h
and gcc/gcc-4.6/gcc/config/linux-android.h

Removed over-patches to build/configure and build/Makefile.in

Change-Id: Ib15e63561aa3c05b6e0d18bfda656781397b175d

2 files changed, 5 insertions, 88 deletions

diff --git a/build/tools/toolchain-patches/gcc/0004-Enable-x86-gcc-defaults.patch b/build/tools/toolchain-patches/gcc/0004-Enable-x86-gcc-defaults.patch
index 019e2616c..03f316df0 100644
--- a/build/tools/toolchain-patches/gcc/0004-Enable-x86-gcc-defaults.patch
+++ b/build/tools/toolchain-patches/gcc/0004-Enable-x86-gcc-defaults.patch
@@ -184,25 +184,12 @@ diff --git a/gcc-4.6/gcc/config/i386/linux.h b/gcc-4.6/gcc/config/i386/linux.h
 index 3a23598..78a4170 100644
 --- a/gcc-4.6/gcc/config/i386/linux.h
 +++ b/gcc-4.6/gcc/config/i386/linux.h
-@@ -72,15 +72,35 @@ along with GCC; see the file COPYING3.  If not see
- #define TARGET_OS_CPP_BUILTINS()		\
-   do						\
-     {						\
--	LINUX_TARGET_OS_CPP_BUILTINS();		\
-+	    LINUX_TARGET_OS_CPP_BUILTINS();		\
-+        ANDROID_TARGET_OS_CPP_BUILTINS();	\
-     }						\
-   while (0)
- 
- #undef CPP_SPEC
- #define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
- 
-+#define OVERRIDE_LINUX_TARGET_CC1_SPEC "%(cc1_cpu) %{profile:-p}"
+@@ -85,7 +85,15 @@
  #undef CC1_SPEC
--#define CC1_SPEC "%(cc1_cpu) %{profile:-p}"
-+#define CC1_SPEC                                               \
-+  LINUX_OR_ANDROID_CC (OVERRIDE_LINUX_TARGET_CC1_SPEC,                  \
-+                       OVERRIDE_LINUX_TARGET_CC1_SPEC \
+ #define CC1_SPEC \
+   LINUX_OR_ANDROID_CC (LINUX_TARGET_CC1_SPEC, \
+-		       LINUX_TARGET_CC1_SPEC " " ANDROID_CC1_SPEC)
++                       LINUX_TARGET_CC1_SPEC \
 +                       " -march=i686 -mtune=atom" \
 +                       " -mstackrealign -msse3 -mfpmath=sse" \
 +                       " -m32 -fno-short-enums" \
@@ -211,68 +198,13 @@ index 3a23598..78a4170 100644
 +
 +#define CC1PLUS_SPEC \
 +  LINUX_OR_ANDROID_CC ("", ANDROID_CC1PLUS_SPEC)
-+
-+#undef  LIB_SPEC
-+#define LIB_SPEC \
-+  LINUX_OR_ANDROID_LD ("", ANDROID_LIB_SPEC)
-+
-+#undef  STARTFILE_SPEC
-+#define STARTFILE_SPEC \
-+  LINUX_OR_ANDROID_LD ("", ANDROID_STARTFILE_SPEC)
  
  /* Provide a LINK_SPEC appropriate for Linux.  Here we provide support
     for the special GCC options -static and -shared, which allow us to
-@@ -112,22 +132,27 @@ along with GCC; see the file COPYING3.  If not see
-   { "link_emulation", LINK_EMULATION },\
-   { "dynamic_linker", LINUX_DYNAMIC_LINKER }
- 
--#undef	LINK_SPEC
--#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define OVERRIDE_LINUX_TARGET_LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-       -dynamic-linker %(dynamic_linker)} \
-       %{static:-static}}"
-+#undef	LINK_SPEC
-+#define LINK_SPEC                                              \
-+  LINUX_OR_ANDROID_LD (OVERRIDE_LINUX_TARGET_LINK_SPEC,                 \
-+                      OVERRIDE_LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC)
- 
- /* Similar to standard Linux, but adding -ffast-math support.  */
--#undef  ENDFILE_SPEC
--#define ENDFILE_SPEC \
-+#define OVERRIDE_LINUX_TARGET_ENDFILE_SPEC \
-   "%{Ofast|ffast-math|funsafe-math-optimizations:crtfastmath.o%s} \
-    %{mpc32:crtprec32.o%s} \
-    %{mpc64:crtprec64.o%s} \
-    %{mpc80:crtprec80.o%s} \
-    %{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
-+#undef  ENDFILE_SPEC
-+#define ENDFILE_SPEC \
-+  LINUX_OR_ANDROID_LD (OVERRIDE_LINUX_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
- 
- /* A C statement (sans semicolon) to output to the stdio stream
-    FILE the assembler definition of uninitialized global DECL named
 diff --git a/gcc-4.6/gcc/config/linux-android.h b/gcc-4.6/gcc/config/linux-android.h
 index 7256082..d30e157 100644
 --- a/gcc-4.6/gcc/config/linux-android.h
 +++ b/gcc-4.6/gcc/config/linux-android.h
-@@ -20,10 +20,10 @@
-    along with GCC; see the file COPYING3.  If not see
-    <http://www.gnu.org/licenses/>.  */
- 
--#define ANDROID_TARGET_OS_CPP_BUILTINS()			\
--    do {							\
--	if (OPTION_ANDROID)					\
--	  builtin_define ("__ANDROID__");			\
-+#define ANDROID_TARGET_OS_CPP_BUILTINS()                        \
-+    do {                                                        \
-+        if (OPTION_ANDROID)                                     \
-+          builtin_define ("__ANDROID__");                       \
-     } while (0)
- 
- #if ANDROID_DEFAULT
 @@ -41,9 +41,9 @@
  #define ANDROID_LINK_SPEC \
    "%{shared: -Bsymbolic}"
diff --git a/build/tools/toolchain-patches/gcc/0005-Use-the-correct-CRT-files-with-shared-link-option.patch b/build/tools/toolchain-patches/gcc/0005-Use-the-correct-CRT-files-with-shared-link-option.patch
index b48ab58c1..faa71d6d7 100644
--- a/build/tools/toolchain-patches/gcc/0005-Use-the-correct-CRT-files-with-shared-link-option.patch
+++ b/build/tools/toolchain-patches/gcc/0005-Use-the-correct-CRT-files-with-shared-link-option.patch
@@ -6,7 +6,6 @@ Subject: Use the correct CRT files with -shared link option
 Change-Id: I5f9b28cc3bcf7d3a0ead9777d26b563ff6e82760
 ---
  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
@@ -23,20 +22,6 @@ index d30e157..1edc398 100644
  #define ANDROID_ENDFILE_SPEC \
 -  "%{!shared: crtend_android%O%s}"
 +  "%{!shared: crtend_android%O%s;: crtend_so%O%s}"
-diff --git a/gcc-4.6/gcc/config/linux-android.h b/gcc-4.6/gcc/config/linux-android.h
-index d30e157..1edc398 100644
---- a/gcc-4.6/gcc/config/linux-android.h
-+++ b/gcc-4.6/gcc/config/linux-android.h
-@@ -54,7 +54,7 @@
- 
- #define ANDROID_STARTFILE_SPEC						\
-   "%{!shared:"								\
--  "  %{static: crtbegin_static%O%s;: crtbegin_dynamic%O%s}}"
-+  "  %{static: crtbegin_static%O%s;: crtbegin_dynamic%O%s};: crtbegin_so%O%s}"
- 
- #define ANDROID_ENDFILE_SPEC \
--  "%{!shared: crtend_android%O%s}"
-+  "%{!shared: crtend_android%O%s;: crtend_so%O%s}"
 -- 
 1.7.6.rc0