Update NDK local patchset

This patch modifies our local NDK patches by rebasing them against
a more recent version of the toolchain sources (2012-04-20, while
the old ones were based on 2011-02-23).

Note that this removes certain local patches that are now in the
toolchain tree.

This allows us to integrate many bugfixes into the toolchain build.

Note: This is the first in a series of several patches that will
      add support fro GCC 4.6 and GDB 7.1.x/7.3.x. For now, the
      local patches still only apply to gcc 4.4.3 and gdb 6.6.

If you want to check this patch, you should do the following:

  - download the source tree _before_ applying this patch:

      download-toolchain-sources.sh /tmp/ndk-src1

  - download the source tree _after_ applying this patch:

      download-toolchain-sources.sh /tmp/ndk-src2

  - compare the two source trees in details, e.g. with:

      meld /tmp/ndk-src1 /tmp/ndk-src2

All the differences are supposed to come from upstream.

Change-Id: I881b231bec3ac04d1cd1de298aa96e44b46e44bb

build/tools/dev-defaults.sh

@@ -23,7 +23,7 @@ GNUSTL_SUBDIR=sources/cxx-stl/gnu-libstdc++
 
 # The date to use when downloading toolchain sources from AOSP servers
 # Leave it empty for tip of tree.
-TOOLCHAIN_GIT_DATE=2011-02-23
+TOOLCHAIN_GIT_DATE=2012-04-19
 
 # The space-separated list of all GCC versions we support in this NDK
 DEFAULT_GCC_VERSION_LIST="4.4.3"

build/tools/toolchain-patches/build/0001-build-Allow-LDFLAGS_FOR_TARGET-to-be-passed-to-GCC-c.patch

-From dfd5acc639daf945e9afd190678b781d83368eeb Mon Sep 17 00:00:00 2001
-From: David 'Digit' Turner <digit@android.com>
-Date: Thu, 7 Apr 2011 16:02:23 +0200
-Subject: [PATCH] build: Allow LDFLAGS_FOR_TARGET to be passed to GCC configure script.
-
-This patch is a small hack that allows the value of LDFLAGS_FOR_TARGET
-as defined when the build configure script is invoked to be passed
-also to the GCC build script.
-
-This is necessary to build the x86 NDK toolchain. Probably not the
-cleanest way to do it though, so the compiler team may want something
-else for the sources on android.git.kernel.org.
-
-Change-Id: I2b34ad6c28ede29a8b8244dd54ec607369661b5a
----
- Makefile.in  |    2 +-
- configure    |    1 +
- configure.ac |    1 +
- 3 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index e445deb..85c0060 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -123,7 +123,7 @@ export	CC_FOR_TARGET="$(TARGET_GCC_BUILDDIR)/gcc/xgcc \
- #
- CFLAGS_FOR_TARGET+= -O2 -Os -g
- CXXFLAGS_FOR_TARGET+=$(CFLAGS_FOR_TARGET)
--LDFLAGS_FOR_TARGET=
-+LDFLAGS_FOR_TARGET=@LDFLAGS_FOR_TARGET@
- 
- # Helper
- prefix-list = $(foreach e, $(2), $(join $1, $e))
-diff --git a/configure b/configure
-index d6e17ff..15a1ac4 100755
---- a/configure
-+++ b/configure
-@@ -2773,6 +2773,7 @@ s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
- s,@INSTALL_DATA@,$INSTALL_DATA,;t t
- s,@BUILD_ANDROID_GCC@,$BUILD_ANDROID_GCC,;t t
- s,@GDB_TARGET@,$GDB_TARGET,;t t
-+s,@LDFLAGS_FOR_TARGET@,$LDFLAGS_FOR_TARGET,;t t
- s,@TOPLEVEL_CONFIGURE_ARGUMENTS@,$TOPLEVEL_CONFIGURE_ARGUMENTS,;t t
- s,@baseargs@,$baseargs,;t t
- s,@gold_baseargs@,$gold_baseargs,;t t
-diff --git a/configure.ac b/configure.ac
-index 3bfcea7..27d5a1f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -44,6 +44,7 @@ case $target in
- esac
- AC_SUBST(BUILD_ANDROID_GCC)
- AC_SUBST(GDB_TARGET)
-+AC_SUBST(LDFLAGS_FOR_TARGET)
- AC_ARG_PROGRAM
- 
- # TOPLEVEL_CONFIGURE_ARGUMENTS lifted from top-level configure.ac in gcc.
--- 
-1.7.3.1
-

build/tools/toolchain-patches/build/0001-ld-Allow-LDFLAGS_FOR_TARGET-to-be-passed-to-GCC-conf.patch

+From 267e5c13d0ca673d6dd235d0b0745af149304875 Mon Sep 17 00:00:00 2001
+From: David 'Digit' Turner <digit@google.com>
+Date: Tue, 7 Feb 2012 14:18:06 +0100
+Subject: ld: Allow LDFLAGS_FOR_TARGET to be passed to GCC configure script.
+
+This patch is a small hack that allows the value of LDFLAGS_FOR_TARGET
+as defined when the build configure script is invoked to be passed
+also to the GCC build script.
+
+This is necessary to build the x86 NDK toolchain. Probably not the
+cleanest way to do it though, so the compiler team may want something
+else for the sources on android.googlesource.com.
+---
+ Makefile.in  |    2 +-
+ configure    |   39 ++++++++++++++++++++++++---------------
+ configure.ac |    1 +
+ 3 files changed, 26 insertions(+), 16 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index ea3bd2d..0b73ff6 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -148,7 +148,7 @@ export	CC_FOR_TARGET="$(TARGET_GCC_BUILDDIR)/gcc/xgcc \
+ #
+ CFLAGS_FOR_TARGET+= -O2 -Os -g
+ CXXFLAGS_FOR_TARGET+=$(CFLAGS_FOR_TARGET)
+-LDFLAGS_FOR_TARGET=
++LDFLAGS_FOR_TARGET=@LDFLAGS_FOR_TARGET@
+ 
+ # Helper
+ prefix-list = $(foreach e, $(2), $(join $1, $e))
+diff --git a/configure b/configure
+index e7c02f8..236fb93 100755
+--- a/configure
++++ b/configure
+@@ -1,10 +1,12 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.64 for android-tools 2.0.
++# Generated by GNU Autoconf 2.65 for android-tools 2.0.
++#
+ #
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+-# Foundation, Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
++#
+ #
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+@@ -523,7 +525,8 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+ 
+ 
+-exec 7<&0 </dev/null 6>&1
++test -n "$DJDIR" || exec 7<&0 </dev/null
++exec 6>&1
+ 
+ # Name of the host.
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+@@ -581,6 +584,7 @@ gold_baseargs
+ enable_gold
+ baseargs
+ TOPLEVEL_CONFIGURE_ARGUMENTS
++LDFLAGS_FOR_TARGET
+ GDB_TARGET
+ BUILD_ANDROID_GCC
+ INSTALL_DATA
+@@ -1388,7 +1392,7 @@ test -n "$ac_init_help" && exit $ac_status
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ android-tools configure 2.0
+-generated by GNU Autoconf 2.64
++generated by GNU Autoconf 2.65
+ 
+ Copyright (C) 2009 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+@@ -1405,7 +1409,7 @@ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by android-tools $as_me 2.0, which was
+-generated by GNU Autoconf 2.64.  Invocation command line was
++generated by GNU Autoconf 2.65.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -1658,7 +1662,7 @@ fi
+ for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+ do
+   test "x$ac_site_file" = xNONE && continue
+-  if test -r "$ac_site_file"; then
++  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
+     sed 's/^/| /' "$ac_site_file" >&5
+@@ -1667,9 +1671,9 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
+ done
+ 
+ if test -r "$cache_file"; then
+-  # Some versions of bash will fail to source /dev/null (special
+-  # files actually), so we avoid doing that.
+-  if test -f "$cache_file"; then
++  # Some versions of bash will fail to source /dev/null (special files
++  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
++  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+ $as_echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+@@ -2009,6 +2013,7 @@ case $target in
+ esac
+ 
+ 
++
+ test "$program_prefix" != NONE &&
+   program_transform_name="s&^&$program_prefix&;$program_transform_name"
+ # Use a double $ so make ignores it.
+@@ -3453,7 +3458,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ # values after options handling.
+ ac_log="
+ This file was extended by android-tools $as_me 2.0, which was
+-generated by GNU Autoconf 2.64.  Invocation command line was
++generated by GNU Autoconf 2.65.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -3488,6 +3493,7 @@ Usage: $0 [OPTION]... [TAG]...
+ 
+   -h, --help       print this help, then exit
+   -V, --version    print version number and configuration settings, then exit
++      --config     print configuration, then exit
+   -q, --quiet, --silent
+                    do not print progress messages
+   -d, --debug      don't remove temporary files
+@@ -3502,10 +3508,11 @@ Report bugs to the package provider."
+ 
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ android-tools config.status 2.0
+-configured by $0, generated by GNU Autoconf 2.64,
+-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
++configured by $0, generated by GNU Autoconf 2.65,
++  with options \\"\$ac_cs_config\\"
+ 
+ Copyright (C) 2009 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+@@ -3541,6 +3548,8 @@ do
+     ac_cs_recheck=: ;;
+   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+     $as_echo "$ac_cs_version"; exit ;;
++  --config | --confi | --conf | --con | --co | --c )
++    $as_echo "$ac_cs_config"; exit ;;
+   --debug | --debu | --deb | --de | --d | -d )
+     debug=: ;;
+   --file | --fil | --fi | --f )
+@@ -3708,7 +3717,7 @@ s/'"$ac_delim"'$//
+ t delim
+ :nl
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more1
+ s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+ p
+@@ -3722,7 +3731,7 @@ s/.\{148\}//
+ t nl
+ :delim
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more2
+ s/["\\]/\\&/g; s/^/"/; s/$/"/
+ p
+diff --git a/configure.ac b/configure.ac
+index b4d56bb..ee13f88 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -44,6 +44,7 @@ case $target in
+ esac
+ AC_SUBST(BUILD_ANDROID_GCC)
+ AC_SUBST(GDB_TARGET)
++AC_SUBST(LDFLAGS_FOR_TARGET)
+ AC_ARG_PROGRAM
+ 
+ # TOPLEVEL_CONFIGURE_ARGUMENTS lifted from top-level configure.ac in gcc.
+-- 
+1.7.6.rc0
+

build/tools/toolchain-patches/build/0001-Options-brought-in-from-core-combo-for-IA.patch → build/tools/toolchain-patches/build/0002-Options-brought-in-from-core-combo-for-IA.patch

-From 018ee29a56875dbed15f3927f2b99cb0bb3ee9fa Mon Sep 17 00:00:00 2001
-From: Bruce Beare <bruce.j.beare@intel.com>
-Date: Fri, 29 Apr 2011 09:00:39 -0700
-Subject: [PATCH] Options brought in from core/combo/* for IA
+From 8af06f06691438b44e2bed6290fa08bc2a3209e1 Mon Sep 17 00:00:00 2001
+From: David 'Digit' Turner <digit@google.com>
+Date: Tue, 7 Feb 2012 14:20:10 +0100
+Subject: Options brought in from core/combo/* for IA
 
-Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
-Author: Mark D Horn <mark.d.horn@intel.com>
 ---
  Makefile.in |   29 +++++++++++++++++++++++++++++
  1 files changed, 29 insertions(+), 0 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 9a2851d..61e5643 100644
+index 0b73ff6..c7b5847 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -317,6 +317,35 @@ GCC_CONFIG_ARGS += $(GCC_CONFIG_LIBSTDCXX_V3) --disable-libssp \
- 	--disable-libstdc__-v3 --disable-sjlj-exceptions --disable-shared \
- 	--disable-tls
+@@ -431,6 +431,35 @@ GCC_CONFIG_ARGS += $(GCC_CONFIG_LIBSTDCXX_V3) --disable-libssp \
+ 	--disable-tls --disable-libitm
+ 
  CFLAGS_FOR_TARGET += -DTARGET_POSIX_IO -fno-short-enums
 +
 +ifeq ($(target_cpu),x86)
@@ -29,7 +27,7 @@ index 9a2851d..61e5643 100644
 +	-finline-limit=300 -fmessage-length=0 -fno-inline-functions-called-once \
 +	-fno-strict-aliasing -frtti \
 +	-fstrict-aliasing -funswitch-loops -funwind-tables \
-+	-march=atom -mbionic -mfpmath=sse -mstackrealign -DUSE_SSE2
++	-march=i686 -mtune=atom -mbionic -mfpmath=sse -mstackrealign -DUSE_SSE2
 +
 +LDFLAGS_FOR_TARGET += \
 +	-m32 -O2 -g -fPIC \
@@ -50,5 +48,5 @@ index 9a2851d..61e5643 100644
  ifeq ($(target_cpu),arm)
  GCC_CONFIG_ARGS += --with-float=soft --with-fpu=vfp --with-arch=armv5te \
 -- 
-1.7.0.4
+1.7.6.rc0
 

build/tools/toolchain-patches/build/0002-build-mips.patch → build/tools/toolchain-patches/build/0003-ndk-Add-MIPS-support-to-configure-scripts.patch

-commit a16693d78bb1a3ec66d9205156b13d3724c1a140
-Author: Chao-Ying Fu <fu@mips.com>
-Date:   Sat Mar 10 15:51:01 2012 -0800
+From e1bb4ce7e12fdc2b2e3d55ccc4518a78e250a9b3 Mon Sep 17 00:00:00 2001
+From: Char-Ying Fu <fu@mips.com>
+Date: Fri, 20 Apr 2012 17:27:04 +0200
+Subject: ndk: Add MIPS support to configure scripts
 
-    Add MIPS support to scripts
+Change-Id: Ie19e190510d006832504125c6a7c1dd22e013abd
+---
+ configure    |    5 +++++
+ configure.ac |    5 +++++
+ 2 files changed, 10 insertions(+), 0 deletions(-)
 
 diff --git a/configure b/configure
-index 6b044d7..ad3d157 100755
+index 236fb93..6300b2b 100755
 --- a/configure
 +++ b/configure
-@@ -1376,6 +1376,7 @@ test -n "$target_alias" &&
+@@ -1995,6 +1995,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  # 2. arm-eabi (for Android kernel)
  # 3. arm-newlib-eabi (for gcc testing)
  # 4.i[3456]86-*-linux-gnu, x86-*-linux-gnu (for x86 targets)
@@ -16,7 +21,7 @@ index 6b044d7..ad3d157 100755
  
  GDB_TARGET=$target
  case $target in
-@@ -1389,6 +1390,10 @@ case $target in
+@@ -2008,6 +2009,10 @@ case $target in
    i[3456]86-*-linux-gnu | x86_64-*-linux-gnu)
      BUILD_ANDROID_GCC=yes
      ;;
@@ -25,13 +30,13 @@ index 6b044d7..ad3d157 100755
 +    GDB_TARGET=mipsel-linux-gnu
 +    ;;
    *)
-     { { echo "$as_me:$LINENO: error: Unsupported target $target." >&5
- echo "$as_me: error: Unsupported target $target." >&2;}
+     as_fn_error "Unsupported target $target." "$LINENO" 5;
+ esac
 diff --git a/configure.ac b/configure.ac
-index dfec128..18c5a0c 100644
+index ee13f88..c467528 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -23,6 +23,7 @@ AC_CANONICAL_SYSTEM
+@@ -26,6 +26,7 @@ AC_PROG_INSTALL
  # 2. arm-eabi (for Android kernel)
  # 3. arm-newlib-eabi (for gcc testing)
  # 4.i[3456]86-*-linux-gnu, x86-*-linux-gnu (for x86 targets)
@@ -39,7 +44,7 @@ index dfec128..18c5a0c 100644
  
  GDB_TARGET=$target
  case $target in
-@@ -36,6 +37,10 @@ case $target in
+@@ -39,6 +40,10 @@ case $target in
    i[[3456]]86-*-linux-gnu | x86_64-*-linux-gnu)
      BUILD_ANDROID_GCC=yes
      ;;
@@ -50,3 +55,6 @@ index dfec128..18c5a0c 100644
    *)
      AC_MSG_ERROR(Unsupported target $target.);
  esac
+-- 
+1.7.6.rc0
+

build/tools/toolchain-patches/gcc/0001-Enable-C-exceptions-and-RTTI-by-default.patch

-From ac8ac691023b7f2b2c21330fef1f28ef56aeba65 Mon Sep 17 00:00:00 2001
+From ee39e01fd0c62ad2c5a357854f4f34abe4dd4560 Mon Sep 17 00:00:00 2001
 From: David 'Digit' Turner <digit@android.com>
 Date: Wed, 24 Nov 2010 14:26:38 +0100
-Subject: [PATCH] Enable C++ exceptions and RTTI by default.
+Subject: Enable C++ exceptions and RTTI by default.
 
 With this change, -fexceptions and -frtti become default options
 when compiling C++ sources.
@@ -12,10 +12,10 @@ Change-Id: Ie136fc1dd57d15dfa062730118c2f8496d25cc62
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/gcc-4.4.3/gcc/config/linux-android.h b/gcc-4.4.3/gcc/config/linux-android.h
-index a43bab5..353baf0 100644
+index 5ca3858..d938c22 100644
 --- a/gcc-4.4.3/gcc/config/linux-android.h
 +++ b/gcc-4.4.3/gcc/config/linux-android.h
-@@ -40,8 +40,8 @@
+@@ -46,8 +46,8 @@
    "%{!fno-pic:%{!fno-PIC:%{!fpic:%{!fPIC: -fPIC}}}}"
  
  #define ANDROID_CC1PLUS_SPEC						\
@@ -27,5 +27,5 @@ index a43bab5..353baf0 100644
  #define ANDROID_LIB_SPEC \
    "%{!static: -ldl}"
 -- 
-1.7.3.1
+1.7.6.rc0
 

build/tools/toolchain-patches/gcc/0001-Update-gcc-4.4.3-for-building-libsupc-in-freestandin.patch

-From d9394eebf42aee6de56a970df3c56e67e5455545 Mon Sep 17 00:00:00 2001
-From: Doug Kwan <dougkwan@google.com>
-Date: Wed, 16 Mar 2011 14:47:42 -0700
-Subject: [PATCH 1/4] Update gcc-4.4.3 for building libsupc++ in freestanding mode.
-
--Backport upstream patch from gcc rev 171019.
-
-Change-Id: I177e4e11f38d57c6ca1d065ebf3e8a37d9bacc33
----
- gcc-4.4.3/README.google                    |    5 +++++
- gcc-4.4.3/libstdc++-v3/include/Makefile.am |    3 ++-
- gcc-4.4.3/libstdc++-v3/include/Makefile.in |    3 ++-
- 3 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/gcc-4.4.3/README.google b/gcc-4.4.3/README.google
-index 47fe1fc..f36db91 100644
---- a/gcc-4.4.3/README.google
-+++ b/gcc-4.4.3/README.google
-@@ -3381,3 +3381,8 @@ gcc/crtstuff.c
-   Owner: dougkwan
-   Status: apply the patch http://gcc.gnu.org/ml/gcc-patches/2011-01/msg01942.html.
-   Not yet upstream.
-+
-+libstdc++/include/Makefile.in
-+  Installed cpu_defines.h in freestanding standing mode (libstdc++/48123)
-+  Owner: dougkwan
-+  Status: In gcc trunk rev 171019
-diff --git a/gcc-4.4.3/libstdc++-v3/include/Makefile.am b/gcc-4.4.3/libstdc++-v3/include/Makefile.am
-index 99a627b..162983a 100644
---- a/gcc-4.4.3/libstdc++-v3/include/Makefile.am
-+++ b/gcc-4.4.3/libstdc++-v3/include/Makefile.am
-@@ -1136,7 +1136,8 @@ endif
- install-freestanding-headers:
- 	$(mkinstalldirs) $(DESTDIR)${gxx_include_dir}
- 	$(mkinstalldirs) $(DESTDIR)${host_installdir}
--	for file in ${host_srcdir}/os_defines.h ${host_builddir}/c++config.h; do \
-+	for file in ${host_srcdir}/os_defines.h ${host_builddir}/c++config.h \
-+	  ${glibcxx_srcdir}/$(CPU_DEFINES_SRCDIR)/cpu_defines.h; do \
- 	  $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done
- 	$(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${std_builddir}
- 	$(INSTALL_DATA) ${std_builddir}/limits $(DESTDIR)${gxx_include_dir}/${std_builddir}
-diff --git a/gcc-4.4.3/libstdc++-v3/include/Makefile.in b/gcc-4.4.3/libstdc++-v3/include/Makefile.in
-index cdaecac..c4614f4 100644
---- a/gcc-4.4.3/libstdc++-v3/include/Makefile.in
-+++ b/gcc-4.4.3/libstdc++-v3/include/Makefile.in
-@@ -1537,7 +1537,8 @@ ${pch3_output}: ${pch3_source} ${pch2_output}
- install-freestanding-headers:
- 	$(mkinstalldirs) $(DESTDIR)${gxx_include_dir}
- 	$(mkinstalldirs) $(DESTDIR)${host_installdir}
--	for file in ${host_srcdir}/os_defines.h ${host_builddir}/c++config.h; do \
-+	for file in ${host_srcdir}/os_defines.h ${host_builddir}/c++config.h \
-+	  ${glibcxx_srcdir}/$(CPU_DEFINES_SRCDIR)/cpu_defines.h; do \
- 	  $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done
- 	$(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${std_builddir}
- 	$(INSTALL_DATA) ${std_builddir}/limits $(DESTDIR)${gxx_include_dir}/${std_builddir}
--- 
-1.7.1
-

build/tools/toolchain-patches/gcc/0001-gcc-prevent-crash-on-Eclair-and-older-platforms.patch → build/tools/toolchain-patches/gcc/0002-gcc-prevent-crash-on-Eclair-and-older-platforms.patch

-From 2761d8d2cb59b5447a9ea1a5b10a1262a84211d6 Mon Sep 17 00:00:00 2001
+From 124e9aace7bdf6f39054d6cef341108d0523b08b Mon Sep 17 00:00:00 2001
 From: David 'Digit' Turner <digit@android.com>
 Date: Tue, 24 May 2011 23:34:22 +0200
-Subject: [PATCH] gcc: prevent crash on Eclair and older platforms.
+Subject: gcc: prevent crash on Eclair and older platforms.
 
 The point of this patch is to work-around a bug in the Eclair
 dynamic linker, which doesn't support weak symbols. By default,
@@ -51,5 +51,5 @@ index 27652f9..a104d91 100644
  #include <unistd.h>
  
 -- 
-1.7.3.1
+1.7.6.rc0
 

build/tools/toolchain-patches/gcc/0002-xgcc-compiles-need-to-use-the-Android-crt-files-as-s.patch

-From 55f3c413cef5e642f05b94ada9cd2365422e8de5 Mon Sep 17 00:00:00 2001
-From: Bruce Beare <bruce.j.beare@intel.com>
-Date: Thu, 17 Mar 2011 11:55:23 -0700
-Subject: [PATCH 2/4] xgcc compiles need to use the Android crt files as specified in LDFLAGS_FOR_TARGET
-
-Change-Id: If494615b055cd5c001ffd7a1722bcbdf9b88abd8
-Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
----
- gcc-4.4.3/Makefile.in  |    2 +-
- gcc-4.4.3/Makefile.tpl |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gcc-4.4.3/Makefile.in b/gcc-4.4.3/Makefile.in
-index 53a5146..c29eab7 100644
---- a/gcc-4.4.3/Makefile.in
-+++ b/gcc-4.4.3/Makefile.in
-@@ -466,7 +466,7 @@ CXXFLAGS_FOR_TARGET = @CXXFLAGS_FOR_TARGET@
- 
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
--LDFLAGS_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS_FOR_TARGET@
- 
- FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
- DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@
-diff --git a/gcc-4.4.3/Makefile.tpl b/gcc-4.4.3/Makefile.tpl
-index ac36409..c05b935 100644
---- a/gcc-4.4.3/Makefile.tpl
-+++ b/gcc-4.4.3/Makefile.tpl
-@@ -436,7 +436,7 @@ CXXFLAGS_FOR_TARGET = @CXXFLAGS_FOR_TARGET@
- 
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
--LDFLAGS_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS_FOR_TARGET@
- 
- FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
- DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@
--- 
-1.7.1
-

build/tools/toolchain-patches/gcc/0001-Work-around-for-Android-__cxa_finalize-bug.patch → build/tools/toolchain-patches/gcc/0003-Work-around-for-Android-__cxa_finalize-bug.patch

-From 27bb0310fa5989c26a2ba83d6efed441023b7230 Mon Sep 17 00:00:00 2001
+From b0e6b0f279592b072fac4a7a1d6ec0530794a7c3 Mon Sep 17 00:00:00 2001
 From: David 'Digit' Turner <digit@android.com>
 Date: Sun, 20 Feb 2011 20:54:32 +0100
-Subject: [PATCH] Work-around for Android __cxa_finalize bug
+Subject: Work-around for Android __cxa_finalize bug
 
 Change-Id: I82364f6ed1ca04ecf3844179bc9887f61226fd75
 ---
@@ -28,5 +28,5 @@ index 63f46a9..845b6d1 100644
        __gthread_key_delete(_M_key);
      _M_init = false;
 -- 
-1.7.3.1
+1.7.6.rc0
 

build/tools/toolchain-patches/gcc/0004-Enable-x86-gcc-defaults.patch

-From fc0c72d824b194f5c5e2c16ae5e706eed3a359fc Mon Sep 17 00:00:00 2001
+From a8b43ba3fb0007f0e62365a33953bab0e989366a Mon Sep 17 00:00:00 2001
 From: Mark D Horn <mark.d.horn@intel.com>
-Date: Tue, 28 Jun 2011 15:35:46 -0700
-Subject: [PATCH 4/4] Enable x86 gcc defaults
+Date: Fri, 20 Apr 2012 17:32:57 +0200
+Subject: Enable x86 gcc defaults
 
 Enabling the same built-in defaults for the x86
 toolchain as is currently done for ARM.
@@ -126,7 +126,7 @@ index f3a98c2..bc2a5d5 100644
  /* 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.4.3/gcc/config/linux-android.h b/gcc-4.4.3/gcc/config/linux-android.h
-index 5ca3858..c1f8f7a 100644
+index d938c22..1c8ee50 100644
 --- a/gcc-4.4.3/gcc/config/linux-android.h
 +++ b/gcc-4.4.3/gcc/config/linux-android.h
 @@ -41,9 +41,9 @@
@@ -140,7 +140,7 @@ index 5ca3858..c1f8f7a 100644
 +  "%{!fno-pic:%{!fno-PIC:%{!fpic:%{!fPIC: " ANDROID_PIC_DEFAULT "}}}}"
  
  #define ANDROID_CC1PLUS_SPEC						\
-   "%{!fexceptions:%{!fno-exceptions: -fno-exceptions}} "		\
+   "%{!fexceptions:%{!fno-exceptions: -fexceptions}} "		\
 -- 
-1.7.1
+1.7.6.rc0
 

build/tools/toolchain-patches/gcc/0005-Use-the-correct-CRT-files-with-shared-link-option.patch

-From e07d9cc9269f72a90853b31d59729aefb5ca74f3 Mon Sep 17 00:00:00 2001
+From ed098c9068adbfddfe031298ded520fb0a1d117a Mon Sep 17 00:00:00 2001
 From: Mark D Horn <mark.d.horn@intel.com>
 Date: Wed, 13 Jul 2011 16:07:35 -0700
-Subject: [PATCH] Use the correct CRT files with -shared link option
+Subject: Use the correct CRT files with -shared link option
 
 Change-Id: I5f9b28cc3bcf7d3a0ead9777d26b563ff6e82760
 Signed-off-by: Mark D Horn <mark.d.horn@intel.com>
@@ -10,7 +10,7 @@ Signed-off-by: Mark D Horn <mark.d.horn@intel.com>
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/gcc-4.4.3/gcc/config/linux-android.h b/gcc-4.4.3/gcc/config/linux-android.h
-index c1f8f7a..3118c42 100644
+index 1c8ee50..380c0ca 100644
 --- a/gcc-4.4.3/gcc/config/linux-android.h
 +++ b/gcc-4.4.3/gcc/config/linux-android.h
 @@ -54,7 +54,7 @@
@@ -24,5 +24,5 @@ index c1f8f7a..3118c42 100644
 -  "%{!shared: crtend_android%O%s}"
 +  "%{!shared: crtend_android%O%s;: crtend_so%O%s}"
 -- 
-1.7.1
+1.7.6.rc0
 

build/tools/toolchain-patches/gcc/0006-Disable-libstdc++-versioning.patch → build/tools/toolchain-patches/gcc/0006-Disable-libstdc-versioning.patch

-diff -burN gcc-a/gcc-4.4.3/libstdc++-v3/src/Makefile.am gcc-b/gcc-4.4.3/libstdc++-v3/src/Makefile.am
---- gcc-a/gcc-4.4.3/libstdc++-v3/src/Makefile.am	2011-10-10 17:32:21.983349054 +0200
-+++ gcc-b/gcc-4.4.3/libstdc++-v3/src/Makefile.am	2011-10-10 17:10:06.474674579 +0200
-@@ -206,7 +206,7 @@
+From 0fedcd10aaab208a64aa61ee5c8c56f3668b2c47 Mon Sep 17 00:00:00 2001
+From: David 'Digit' Turner <digit@google.com>
+Date: Fri, 20 Apr 2012 17:35:57 +0200
+Subject: Disable libstdc++ versioning
+
+This patch ensures that libstdc++ is built as libgnustl_shared.so
+without any version number.
+
+Change-Id: I7dfe8fe379378c58328257448431c8207ee0e6d1
+---
+ gcc-4.4.3/libstdc++-v3/src/Makefile.am |    2 +-
+ gcc-4.4.3/libstdc++-v3/src/Makefile.in |    7 +++++--
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/gcc-4.4.3/libstdc++-v3/src/Makefile.am b/gcc-4.4.3/libstdc++-v3/src/Makefile.am
+index 187e38e..8fc9ef1 100644
+--- a/gcc-4.4.3/libstdc++-v3/src/Makefile.am
++++ b/gcc-4.4.3/libstdc++-v3/src/Makefile.am
+@@ -206,7 +206,7 @@ libstdc___la_DEPENDENCIES = \
  	$(top_builddir)/libsupc++/libsupc++convenience.la
  
  libstdc___la_LDFLAGS = \
@@ -10,10 +25,11 @@ diff -burN gcc-a/gcc-4.4.3/libstdc++-v3/src/Makefile.am gcc-b/gcc-4.4.3/libstdc+
  
  # Use special rules for the deprecated source files so that they find
  # deprecated include files.
-diff -burN gcc-a/gcc-4.4.3/libstdc++-v3/src/Makefile.in gcc-b/gcc-4.4.3/libstdc++-v3/src/Makefile.in
---- gcc-a/gcc-4.4.3/libstdc++-v3/src/Makefile.in	2011-10-10 17:32:21.983349054 +0200
-+++ gcc-b/gcc-4.4.3/libstdc++-v3/src/Makefile.in	2011-10-10 17:10:06.514673034 +0200
-@@ -350,7 +350,7 @@
+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.
@@ -22,7 +38,7 @@ diff -burN gcc-a/gcc-4.4.3/libstdc++-v3/src/Makefile.in gcc-b/gcc-4.4.3/libstdc+
  @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
-@@ -454,7 +454,7 @@
+@@ -454,7 +454,7 @@ libstdc___la_DEPENDENCIES = \
  	$(top_builddir)/libsupc++/libsupc++convenience.la
  
  libstdc___la_LDFLAGS = \
@@ -31,7 +47,7 @@ diff -burN gcc-a/gcc-4.4.3/libstdc++-v3/src/Makefile.in gcc-b/gcc-4.4.3/libstdc+
  
  
  # Use special rules for the deprecated source files so that they find
-@@ -576,6 +576,9 @@
+@@ -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)
  
@@ -41,3 +57,6 @@ diff -burN gcc-a/gcc-4.4.3/libstdc++-v3/src/Makefile.in gcc-b/gcc-4.4.3/libstdc+
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
  
+-- 
+1.7.6.rc0
+

build/tools/toolchain-patches/gcc/0007-gcc-mips.patch

-commit df3ee55c3aaeb307a58c39a6dfc9531433700c18
-Author: Chao-Ying Fu <fu@mips.com>
-Date:   Sat Mar 10 16:59:10 2012 -0800
+From 9592b5a494396db86a578799c669e103bc726595 Mon Sep 17 00:00:00 2001
+From: Chao-Ying Fu <fu@mips.com>
+Date: Fri, 20 Apr 2012 17:37:44 +0200
+Subject: gcc mips
 
-    Add MIPS Android support and default to Little Endian
+Add MIPS Android support and default to Little Endian
+
+Change-Id: Ifac584908c0d5e7b6b6a0e5aea50e464f59f74bc
+---
+ gcc-4.4.3/gcc/config.gcc                  |    6 ++++
+ gcc-4.4.3/gcc/config/mips/linux.h         |   40 ++++++++++++++++++++++++----
+ gcc-4.4.3/gcc/config/mips/t-linux-android |    3 ++
+ gcc-4.4.3/gcc/unwind-dw2-fde-glibc.c      |    6 +++-
+ 4 files changed, 47 insertions(+), 8 deletions(-)
+ create mode 100644 gcc-4.4.3/gcc/config/mips/t-linux-android
 
 diff --git a/gcc-4.4.3/gcc/config.gcc b/gcc-4.4.3/gcc/config.gcc
-index e758dc4..4cd0ece 100644
+index e758dc4..755b90d 100644
 --- a/gcc-4.4.3/gcc/config.gcc
 +++ b/gcc-4.4.3/gcc/config.gcc
 @@ -1628,6 +1628,12 @@ mips*-*-linux*)				# Linux MIPS, either endian.
@@ -123,3 +133,6 @@ index 11f53dd..bad6082 100644
  
  #include <link.h>
  
+-- 
+1.7.6.rc0
+

build/tools/toolchain-patches/gdb/0001-Proper-libthread_db-support-in-gdbserver.patch → build/tools/toolchain-patches/gdb/0001-ndk-Proper-libthread_db-support-in-gdbserver.patch

-From bc7aac86cdf8938f43bc5b9c6f1ac33c1882cf7b Mon Sep 17 00:00:00 2001
+From 13f33eb9ee5367715e648871d18e0d9b14ace815 Mon Sep 17 00:00:00 2001
 From: David 'Digit' Turner <digit@android.com>
-Date: Thu, 25 Nov 2010 18:37:38 +0100
-Subject: [PATCH] Proper libthread_db support in gdbserver.
+Date: Fri, 20 Apr 2012 15:51:23 +0200
+Subject: ndk: Proper libthread_db support in gdbserver
 
-Change-Id: I5ebbb18efe663e7bf24d6147f33cc92f38dea148
+Change-Id: If1c5f967e0f57d205215f28945e682bb5c291170
 ---
  gdb-6.6/gdb/gdbserver/acinclude.m4   |    2 +-
  gdb-6.6/gdb/gdbserver/configure      |    2 +-
@@ -13,7 +13,7 @@ Change-Id: I5ebbb18efe663e7bf24d6147f33cc92f38dea148
  5 files changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/gdb-6.6/gdb/gdbserver/acinclude.m4 b/gdb-6.6/gdb/gdbserver/acinclude.m4
-index aaad2e2..04f023c 100644
+index aaad2e2549d349be0b2b61008b6c248c1cc2aab5..04f023c 100644
 --- a/gdb-6.6/gdb/gdbserver/acinclude.m4
 +++ b/gdb-6.6/gdb/gdbserver/acinclude.m4
 @@ -4,7 +4,7 @@ sinclude(../../bfd/bfd.m4)
@@ -105,5 +105,5 @@ index 638c228..a13117b 100644
  
  if test "$srv_xmlfiles" != ""; then
 -- 
-1.7.3.1
+1.7.6.rc0
 

build/tools/toolchain-patches/gdb/0002-Fix-signal-handling-in-gdbserver-6.6.patch → build/tools/toolchain-patches/gdb/0002-ndk-Fix-signal-handling-in-gdbserver-6.6.patch

-diff -burN gdb-org/gdb-6.6/gdb/gdbserver/linux-low.c gdb/gdb-6.6/gdb/gdbserver/linux-low.c
---- gdb-org/gdb-6.6/gdb/gdbserver/linux-low.c	2010-11-26 09:33:53.446951831 +0100
-+++ gdb/gdb-6.6/gdb/gdbserver/linux-low.c	2010-11-26 10:03:01.905288172 +0100
-@@ -778,6 +778,18 @@
+From e8a15a244fc6b115856ec76c4fc859e1bce90910 Mon Sep 17 00:00:00 2001
+From: David 'Digit' Turner <digit@android.com>
+Date: Fri, 20 Apr 2012 15:52:00 +0200
+Subject: ndk: Fix signal handling in gdbserver-6.6
+
+Change-Id: If68d89886cd3471631f2b80b36b5fd24a5e5ce69
+---
+ gdb-6.6/gdb/gdbserver/linux-low.c |   12 ++++++++++++
+ 1 files changed, 12 insertions(+), 0 deletions(-)
+
+diff --git a/gdb-6.6/gdb/gdbserver/linux-low.c b/gdb-6.6/gdb/gdbserver/linux-low.c
+index 9e2cf63ba13c9f2bcf1ef33e2ba90a6275286a35..f52a379 100644
+--- a/gdb-6.6/gdb/gdbserver/linux-low.c
++++ b/gdb-6.6/gdb/gdbserver/linux-low.c
+@@ -778,6 +778,18 @@ kill_lwp (unsigned long lwpid, int signo)
        errno = 0;
        tkill_failed = 1;
      }
@@ -20,3 +31,6 @@ diff -burN gdb-org/gdb-6.6/gdb/gdbserver/linux-low.c gdb/gdb-6.6/gdb/gdbserver/l
  #endif
  
    return kill (lwpid, signo);
+-- 
+1.7.6.rc0
+

build/tools/toolchain-patches/gdb/0003-Fix-missing-files-checking-in-gdbserver-7.1.x.patch → build/tools/toolchain-patches/gdb/0003-ndk-Fix-missing-files-checking-in-gdbserver-7.1.x.patch

+From cfdbf4fd19eee2be6cc1bc53bd13d331338b313a Mon Sep 17 00:00:00 2001
+From: David 'Digit' Turner <digit@android.com>
+Date: Fri, 20 Apr 2012 15:52:33 +0200
+Subject: ndk: Fix missing files checking in gdbserver 7.1.x
+
+Change-Id: Idcb61f937b63f3af0f1bedf8d7d499d29f98a9dd
+---
+ gdb-7.1.x/gdb/gdbserver/linux-x86-low.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
 diff --git a/gdb-7.1.x/gdb/gdbserver/linux-x86-low.c b/gdb-7.1.x/gdb/gdbserver/linux-x86-low.c
 index 0062432..6793f23 100644
 --- a/gdb-7.1.x/gdb/gdbserver/linux-x86-low.c
@@ -17,3 +27,6 @@ index 0062432..6793f23 100644
  #include <sys/ptrace.h>
  
  #ifndef PTRACE_GET_THREAD_AREA
+-- 
+1.7.6.rc0
+

build/tools/toolchain-patches/gdb/0004-gdb-mips.patch → build/tools/toolchain-patches/gdb/0004-ndk-Fix-MIPS-builds-on-Darwin.patch

-commit 5c0ed10f2820d3f319a0965f76caed0b792565ea
-Author: Chao-Ying Fu <fu@mips.com>
-Date:   Sat Mar 10 17:07:14 2012 -0800
+From 6b165782ea8637aecbcd283f076d4fb2c08b3afb Mon Sep 17 00:00:00 2001
+From: Chao-Ying Fu <fu@mips.com>
+Date: Fri, 20 Apr 2012 15:54:22 +0200
+Subject: ndk: Fix MIPS builds on Darwin
 
-    Fix MIPS builds on Darwin
+Change-Id: I11466da22a4101a5317d2254d7c5b8f16b755b8a
+---
+ gdb-6.6/bfd/sysdep.h            |    2 ++
+ gdb-6.6/sim/common/sim-signal.c |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
 
 diff --git a/gdb-6.6/bfd/sysdep.h b/gdb-6.6/bfd/sysdep.h
-index f6313d3..d3a1b0d 100644
+index f6313d3905ce5a910dc2f8fb7ba945c450a52b3a..d3a1b0d 100644
 --- a/gdb-6.6/bfd/sysdep.h
 +++ b/gdb-6.6/bfd/sysdep.h
 @@ -131,8 +131,10 @@ extern PTR realloc ();
@@ -20,7 +25,7 @@ index f6313d3..d3a1b0d 100644
  #if !HAVE_DECL_STRSTR
  extern char *strstr ();
 diff --git a/gdb-6.6/sim/common/sim-signal.c b/gdb-6.6/sim/common/sim-signal.c
-index 481299c..b568ca8 100644
+index 481299ceeb2bda561d53296cce6804eb188c501..b568ca8 100644
 --- a/gdb-6.6/sim/common/sim-signal.c
 +++ b/gdb-6.6/sim/common/sim-signal.c
 @@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
@@ -32,3 +37,6 @@ index 481299c..b568ca8 100644
  #ifndef SIGTRAP
  #define SIGTRAP 5
  #endif
+-- 
+1.7.6.rc0
+