diff --git a/SOURCES b/SOURCES
index 837c30c..817661f 100644
--- a/SOURCES
+++ b/SOURCES
@@ -1,10 +1,16 @@
-/Users/bccheng/Downloads/prepare-platform-gcc.sh: line 105: /Volumes/android/android-eabi-4.7/toolchains/arm-eabi-4.7/prebuilt/darwin-x86_64//bin/arm-linux-androideabi-gcc: No such file or directory
+Using built-in specs.
+COLLECT_GCC=/Volumes/android/android-eabi-4.7-2012-12-03/toolchains/arm-eabi-4.7/prebuilt/darwin-x86_64//bin/arm-eabi-gcc
+COLLECT_LTO_WRAPPER=/Volumes/android/android-eabi-4.7-2012-12-03/toolchains/arm-eabi-4.7/prebuilt/darwin-x86_64/bin/../libexec/gcc/arm-eabi/4.7/lto-wrapper
+Target: arm-eabi
+Configured with: /Volumes/android/AOSP-toolchain/build/../gcc/gcc-4.7/configure --prefix=/Volumes/android/toolchain-build-eabi-4.7/prefix --target=arm-eabi --host=x86_64-apple-darwin --build=x86_64-apple-darwin --with-gnu-as --with-gnu-ld --enable-languages=c,c++ --with-gmp=/Volumes/android/toolchain-build-eabi-4.7/temp-install --with-mpfr=/Volumes/android/toolchain-build-eabi-4.7/temp-install --with-mpc=/Volumes/android/toolchain-build-eabi-4.7/temp-install --without-ppl --without-cloog --disable-libssp --enable-threads --disable-nls --disable-libmudflap --disable-libgomp --disable-libstdc__-v3 --disable-sjlj-exceptions --disable-shared --disable-tls --disable-libitm --with-float=soft --with-fpu=vfp --with-arch=armv5te --enable-target-optspace --with-abi=aapcs --enable-initfini-array --disable-nls --prefix=/Volumes/android/toolchain-build-eabi-4.7/prefix --with-sysroot=/Volumes/android/toolchain-build-eabi-4.7/prefix/sysroot --with-binutils-version=2.22 --with-mpfr-version=2.4.1 --with-mpc-version=0.8.1 --with-gmp-version=5.0.5 --with-gcc-version=4.7 --with-gdb-version=7.3.x --with-gxx-include-dir=/Volumes/android/toolchain-build-eabi-4.7/prefix/include/c++/4.7 --with-bugurl=http://source.android.com/source/report-bugs.html --disable-bootstrap --disable-libquadmath --disable-plugin --with-arch=armv5te --disable-gold --program-transform-name='s&^&arm-eabi-&'
+Thread model: single
+gcc version 4.7 (GCC) 
 
 gcc:
-commit 3c56f697e112c79fb5457538fdc373e348beca24
-Author: Andrew Hsieh <andrewhsieh@google.com>
+commit 978fb74a5c086cc5572dc2e3f37d207acad969d7
+Author: Ben Cheng <bccheng@google.com>
 
-    Initial checkin of unmodified gcc-5666.3.tar.gz
+    Enable armv7/thumb2 multilib for arm-eabi.
 
 binutils:
 commit dc51c7a5e0e2620dc85e6c9c46027dce94a85e1f
@@ -13,10 +19,10 @@
     Fix gold issue on fsck_msdos build when objects built by ICC
 
 gdb:
-commit ab1098c4c1c197b6508d86989b4e60d48e0fd512
-Author: Ryan V. Bissell <rbissell@nvidia.com>
+commit 5b9104eb197d16b82cd5a50bf7fe8f721607faeb
+Author: Pavel Chupin <pavel.v.chupin@intel.com>
 
-    bionic support for library-list-svr4.dtd
+    Fix build with --enable-plugins
 
 gmp:
 commit e6b9669dafc6a5f83c80b4b4176359b78bccdc90
diff --git a/arm-eabi/bin/ar b/arm-eabi/bin/ar
index afaa9e4..2389061 100755
--- a/arm-eabi/bin/ar
+++ b/arm-eabi/bin/ar
Binary files differ
diff --git a/arm-eabi/bin/as b/arm-eabi/bin/as
index ac03389..8e2f9c7 100755
--- a/arm-eabi/bin/as
+++ b/arm-eabi/bin/as
Binary files differ
diff --git a/arm-eabi/bin/c++ b/arm-eabi/bin/c++
index babb1c4..67df34c 100755
--- a/arm-eabi/bin/c++
+++ b/arm-eabi/bin/c++
Binary files differ
diff --git a/arm-eabi/bin/g++ b/arm-eabi/bin/g++
index ed41058..e31fe51 100755
--- a/arm-eabi/bin/g++
+++ b/arm-eabi/bin/g++
Binary files differ
diff --git a/arm-eabi/bin/gcc b/arm-eabi/bin/gcc
index b94184b..143b293 100755
--- a/arm-eabi/bin/gcc
+++ b/arm-eabi/bin/gcc
Binary files differ
diff --git a/arm-eabi/bin/ld b/arm-eabi/bin/ld
index 2d0a1a0..525adc0 100755
--- a/arm-eabi/bin/ld
+++ b/arm-eabi/bin/ld
Binary files differ
diff --git a/arm-eabi/bin/ld.bfd b/arm-eabi/bin/ld.bfd
index b619bd3..e942421 100755
--- a/arm-eabi/bin/ld.bfd
+++ b/arm-eabi/bin/ld.bfd
Binary files differ
diff --git a/arm-eabi/bin/nm b/arm-eabi/bin/nm
index ad5ebe5..dff5ec5 100755
--- a/arm-eabi/bin/nm
+++ b/arm-eabi/bin/nm
Binary files differ
diff --git a/arm-eabi/bin/objcopy b/arm-eabi/bin/objcopy
index 2862943..e8d9a70 100755
--- a/arm-eabi/bin/objcopy
+++ b/arm-eabi/bin/objcopy
Binary files differ
diff --git a/arm-eabi/bin/objdump b/arm-eabi/bin/objdump
index 117f881..0c075da 100755
--- a/arm-eabi/bin/objdump
+++ b/arm-eabi/bin/objdump
Binary files differ
diff --git a/arm-eabi/bin/ranlib b/arm-eabi/bin/ranlib
index ec790a4..3cd2984 100755
--- a/arm-eabi/bin/ranlib
+++ b/arm-eabi/bin/ranlib
Binary files differ
diff --git a/arm-eabi/bin/strip b/arm-eabi/bin/strip
index b6b0894..264270b 100755
--- a/arm-eabi/bin/strip
+++ b/arm-eabi/bin/strip
Binary files differ
diff --git a/bin/arm-eabi-addr2line b/bin/arm-eabi-addr2line
index 31ff04d..9ceae33 100755
--- a/bin/arm-eabi-addr2line
+++ b/bin/arm-eabi-addr2line
Binary files differ
diff --git a/bin/arm-eabi-ar b/bin/arm-eabi-ar
index afaa9e4..2389061 100755
--- a/bin/arm-eabi-ar
+++ b/bin/arm-eabi-ar
Binary files differ
diff --git a/bin/arm-eabi-as b/bin/arm-eabi-as
index 095548b..f0cfb73 100755
--- a/bin/arm-eabi-as
+++ b/bin/arm-eabi-as
Binary files differ
diff --git a/bin/arm-eabi-c++ b/bin/arm-eabi-c++
index ed41058..e31fe51 100755
--- a/bin/arm-eabi-c++
+++ b/bin/arm-eabi-c++
Binary files differ
diff --git a/bin/arm-eabi-c++filt b/bin/arm-eabi-c++filt
index e9455bd..33bd5a4 100755
--- a/bin/arm-eabi-c++filt
+++ b/bin/arm-eabi-c++filt
Binary files differ
diff --git a/bin/arm-eabi-cpp b/bin/arm-eabi-cpp
index b9e560e..99b3e0f 100755
--- a/bin/arm-eabi-cpp
+++ b/bin/arm-eabi-cpp
Binary files differ
diff --git a/bin/arm-eabi-elfedit b/bin/arm-eabi-elfedit
index 7e00d22..a1c00cb 100755
--- a/bin/arm-eabi-elfedit
+++ b/bin/arm-eabi-elfedit
Binary files differ
diff --git a/bin/arm-eabi-g++ b/bin/arm-eabi-g++
index 75c6a77..a5078d9 100755
--- a/bin/arm-eabi-g++
+++ b/bin/arm-eabi-g++
Binary files differ
diff --git a/bin/arm-eabi-gcc b/bin/arm-eabi-gcc
index 339dee7..0cc509d 100755
--- a/bin/arm-eabi-gcc
+++ b/bin/arm-eabi-gcc
Binary files differ
diff --git a/bin/arm-eabi-gcc-4.7 b/bin/arm-eabi-gcc-4.7
index bb497c0..a6d7a03 100755
--- a/bin/arm-eabi-gcc-4.7
+++ b/bin/arm-eabi-gcc-4.7
Binary files differ
diff --git a/bin/arm-eabi-gcov b/bin/arm-eabi-gcov
index 5782625..0335e1f 100755
--- a/bin/arm-eabi-gcov
+++ b/bin/arm-eabi-gcov
Binary files differ
diff --git a/bin/arm-eabi-gdb b/bin/arm-eabi-gdb
index fdb62ee..750bb3e 100755
--- a/bin/arm-eabi-gdb
+++ b/bin/arm-eabi-gdb
Binary files differ
diff --git a/bin/arm-eabi-gdbtui b/bin/arm-eabi-gdbtui
index 7094d28..ef2a9dc 100755
--- a/bin/arm-eabi-gdbtui
+++ b/bin/arm-eabi-gdbtui
Binary files differ
diff --git a/bin/arm-eabi-gprof b/bin/arm-eabi-gprof
index 886ba91..d3d53cd 100755
--- a/bin/arm-eabi-gprof
+++ b/bin/arm-eabi-gprof
Binary files differ
diff --git a/bin/arm-eabi-ld b/bin/arm-eabi-ld
index 3d4cc1c..e0754a4 100755
--- a/bin/arm-eabi-ld
+++ b/bin/arm-eabi-ld
Binary files differ
diff --git a/bin/arm-eabi-ld.bfd b/bin/arm-eabi-ld.bfd
index e946f23..f81faef 100755
--- a/bin/arm-eabi-ld.bfd
+++ b/bin/arm-eabi-ld.bfd
Binary files differ
diff --git a/bin/arm-eabi-nm b/bin/arm-eabi-nm
index 8219cb9..3b50f8c 100755
--- a/bin/arm-eabi-nm
+++ b/bin/arm-eabi-nm
Binary files differ
diff --git a/bin/arm-eabi-objcopy b/bin/arm-eabi-objcopy
index ab236cb..80e2149 100755
--- a/bin/arm-eabi-objcopy
+++ b/bin/arm-eabi-objcopy
Binary files differ
diff --git a/bin/arm-eabi-objdump b/bin/arm-eabi-objdump
index 117f881..0c075da 100755
--- a/bin/arm-eabi-objdump
+++ b/bin/arm-eabi-objdump
Binary files differ
diff --git a/bin/arm-eabi-ranlib b/bin/arm-eabi-ranlib
index e82f7b1..525343e 100755
--- a/bin/arm-eabi-ranlib
+++ b/bin/arm-eabi-ranlib
Binary files differ
diff --git a/bin/arm-eabi-readelf b/bin/arm-eabi-readelf
index f7c4d8d..9f9adae 100755
--- a/bin/arm-eabi-readelf
+++ b/bin/arm-eabi-readelf
Binary files differ
diff --git a/bin/arm-eabi-run b/bin/arm-eabi-run
index dc0e7e6..a8084ad 100755
--- a/bin/arm-eabi-run
+++ b/bin/arm-eabi-run
Binary files differ
diff --git a/bin/arm-eabi-size b/bin/arm-eabi-size
index 4ebf811..4855158 100755
--- a/bin/arm-eabi-size
+++ b/bin/arm-eabi-size
Binary files differ
diff --git a/bin/arm-eabi-strings b/bin/arm-eabi-strings
index f4d958a..f6b5c52 100755
--- a/bin/arm-eabi-strings
+++ b/bin/arm-eabi-strings
Binary files differ
diff --git a/bin/arm-eabi-strip b/bin/arm-eabi-strip
index 66986f5..75b824b 100755
--- a/bin/arm-eabi-strip
+++ b/bin/arm-eabi-strip
Binary files differ
diff --git a/lib/gcc/arm-eabi/4.7/libgcc.a b/lib/gcc/arm-eabi/4.7/libgcc.a
index 60a4a24..911e2a2 100644
--- a/lib/gcc/arm-eabi/4.7/libgcc.a
+++ b/lib/gcc/arm-eabi/4.7/libgcc.a
Binary files differ
diff --git a/lib/gcc/arm-eabi/4.7/libgcov.a b/lib/gcc/arm-eabi/4.7/libgcov.a
index 9626ce5..49cfbc2 100644
--- a/lib/gcc/arm-eabi/4.7/libgcov.a
+++ b/lib/gcc/arm-eabi/4.7/libgcov.a
Binary files differ
diff --git a/lib/gcc/arm-eabi/4.7/thumb/crtbegin.o b/lib/gcc/arm-eabi/4.7/thumb/crtbegin.o
new file mode 100644
index 0000000..6de8e5a
--- /dev/null
+++ b/lib/gcc/arm-eabi/4.7/thumb/crtbegin.o
Binary files differ
diff --git a/lib/gcc/arm-eabi/4.7/thumb/crtend.o b/lib/gcc/arm-eabi/4.7/thumb/crtend.o
new file mode 100644
index 0000000..d48c27b
--- /dev/null
+++ b/lib/gcc/arm-eabi/4.7/thumb/crtend.o
Binary files differ
diff --git a/lib/gcc/arm-eabi/4.7/thumb/crti.o b/lib/gcc/arm-eabi/4.7/thumb/crti.o
new file mode 100644
index 0000000..19b3b7a
--- /dev/null
+++ b/lib/gcc/arm-eabi/4.7/thumb/crti.o
Binary files differ
diff --git a/lib/gcc/arm-eabi/4.7/thumb/crtn.o b/lib/gcc/arm-eabi/4.7/thumb/crtn.o
new file mode 100644
index 0000000..be064e9
--- /dev/null
+++ b/lib/gcc/arm-eabi/4.7/thumb/crtn.o
Binary files differ
diff --git a/lib/gcc/arm-eabi/4.7/thumb/libgcc.a b/lib/gcc/arm-eabi/4.7/thumb/libgcc.a
new file mode 100644
index 0000000..3e4e715
--- /dev/null
+++ b/lib/gcc/arm-eabi/4.7/thumb/libgcc.a
Binary files differ
diff --git a/lib/gcc/arm-eabi/4.7/thumb/libgcov.a b/lib/gcc/arm-eabi/4.7/thumb/libgcov.a
new file mode 100644
index 0000000..0913d49
--- /dev/null
+++ b/lib/gcc/arm-eabi/4.7/thumb/libgcov.a
Binary files differ
diff --git a/lib/gcc/arm-eabi/4.7/thumb/thumb2/crtbegin.o b/lib/gcc/arm-eabi/4.7/thumb/thumb2/crtbegin.o
new file mode 100644
index 0000000..c5d6cad
--- /dev/null
+++ b/lib/gcc/arm-eabi/4.7/thumb/thumb2/crtbegin.o
Binary files differ
diff --git a/lib/gcc/arm-eabi/4.7/thumb/thumb2/crtend.o b/lib/gcc/arm-eabi/4.7/thumb/thumb2/crtend.o
new file mode 100644
index 0000000..60c31ce
--- /dev/null
+++ b/lib/gcc/arm-eabi/4.7/thumb/thumb2/crtend.o
Binary files differ
diff --git a/lib/gcc/arm-eabi/4.7/thumb/thumb2/crti.o b/lib/gcc/arm-eabi/4.7/thumb/thumb2/crti.o
new file mode 100644
index 0000000..2758e27
--- /dev/null
+++ b/lib/gcc/arm-eabi/4.7/thumb/thumb2/crti.o
Binary files differ
diff --git a/lib/gcc/arm-eabi/4.7/thumb/thumb2/crtn.o b/lib/gcc/arm-eabi/4.7/thumb/thumb2/crtn.o
new file mode 100644
index 0000000..3d23212
--- /dev/null
+++ b/lib/gcc/arm-eabi/4.7/thumb/thumb2/crtn.o
Binary files differ
diff --git a/lib/gcc/arm-eabi/4.7/thumb/thumb2/libgcc.a b/lib/gcc/arm-eabi/4.7/thumb/thumb2/libgcc.a
new file mode 100644
index 0000000..748bd05
--- /dev/null
+++ b/lib/gcc/arm-eabi/4.7/thumb/thumb2/libgcc.a
Binary files differ
diff --git a/lib/gcc/arm-eabi/4.7/thumb/thumb2/libgcov.a b/lib/gcc/arm-eabi/4.7/thumb/thumb2/libgcov.a
new file mode 100644
index 0000000..2f33d37
--- /dev/null
+++ b/lib/gcc/arm-eabi/4.7/thumb/thumb2/libgcov.a
Binary files differ
diff --git a/lib/libarm-linux-android-sim.a b/lib/libarm-linux-android-sim.a
index 43b3ca6..f4db941 100644
--- a/lib/libarm-linux-android-sim.a
+++ b/lib/libarm-linux-android-sim.a
Binary files differ
diff --git a/lib/x86_64/libiberty.a b/lib/x86_64/libiberty.a
index 0983bf9..98a27ed 100644
--- a/lib/x86_64/libiberty.a
+++ b/lib/x86_64/libiberty.a
Binary files differ
diff --git a/lib32/libbfd.a b/lib32/libbfd.a
index 4f8cc8d..8074f97 100644
--- a/lib32/libbfd.a
+++ b/lib32/libbfd.a
Binary files differ
diff --git a/lib32/libiberty.a b/lib32/libiberty.a
index b6e1759..b0b871c 100644
--- a/lib32/libiberty.a
+++ b/lib32/libiberty.a
Binary files differ
diff --git a/lib32/libintl.a b/lib32/libintl.a
index 8bc7c4e..a068fd4 100644
--- a/lib32/libintl.a
+++ b/lib32/libintl.a
Binary files differ
diff --git a/libexec/gcc/arm-eabi/4.7/cc1 b/libexec/gcc/arm-eabi/4.7/cc1
index ca901a0..0496425 100755
--- a/libexec/gcc/arm-eabi/4.7/cc1
+++ b/libexec/gcc/arm-eabi/4.7/cc1
Binary files differ
diff --git a/libexec/gcc/arm-eabi/4.7/cc1plus b/libexec/gcc/arm-eabi/4.7/cc1plus
index b00e750..e76eb79 100755
--- a/libexec/gcc/arm-eabi/4.7/cc1plus
+++ b/libexec/gcc/arm-eabi/4.7/cc1plus
Binary files differ
diff --git a/libexec/gcc/arm-eabi/4.7/collect2 b/libexec/gcc/arm-eabi/4.7/collect2
index b8bf948..a9f96e7 100755
--- a/libexec/gcc/arm-eabi/4.7/collect2
+++ b/libexec/gcc/arm-eabi/4.7/collect2
Binary files differ
diff --git a/libexec/gcc/arm-eabi/4.7/lto-wrapper b/libexec/gcc/arm-eabi/4.7/lto-wrapper
index 127b3dd..c7baf32 100755
--- a/libexec/gcc/arm-eabi/4.7/lto-wrapper
+++ b/libexec/gcc/arm-eabi/4.7/lto-wrapper
Binary files differ
diff --git a/libexec/gcc/arm-eabi/4.7/lto1 b/libexec/gcc/arm-eabi/4.7/lto1
index 1d6b64d..6dafffe 100755
--- a/libexec/gcc/arm-eabi/4.7/lto1
+++ b/libexec/gcc/arm-eabi/4.7/lto1
Binary files differ