diff --git a/SOURCES b/SOURCES
index d50af7f..208486a 100644
--- a/SOURCES
+++ b/SOURCES
@@ -1,10 +1,16 @@
-/home/bccheng/ShellScripts/prepare-platform-gcc.sh: line 105: /tmp/android-eabi-4.7/toolchains/arm-eabi-4.7/prebuilt/linux-x86_64/bin/arm-linux-androideabi-gcc: No such file or directory
+Using built-in specs.
+COLLECT_GCC=/tmp/android-eabi-4.7-2012-12-03/toolchains/arm-eabi-4.7/prebuilt/linux-x86_64//bin/arm-eabi-gcc
+COLLECT_LTO_WRAPPER=/tmp/android-eabi-4.7-2012-12-03/toolchains/arm-eabi-4.7/prebuilt/linux-x86_64/bin/../libexec/gcc/arm-eabi/4.7/lto-wrapper
+Target: arm-eabi
+Configured with: /tmp/AOSP-toolchain/build/../gcc/gcc-4.7/configure --prefix=/tmp/toolchain-build-eabi/prefix --target=arm-eabi --host=x86_64-linux-gnu --build=x86_64-linux-gnu --with-gnu-as --with-gnu-ld --enable-languages=c,c++ --with-gmp=/tmp/toolchain-build-eabi/temp-install --with-mpfr=/tmp/toolchain-build-eabi/temp-install --with-mpc=/tmp/toolchain-build-eabi/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=/tmp/toolchain-build-eabi/prefix --with-sysroot=/tmp/toolchain-build-eabi/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=/tmp/toolchain-build-eabi/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 cdc955d..832f545 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 bb5c090..53bfcb1 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 f028366..5b72f93 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 f028366..5b72f93 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 b422f05..919e523 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 23e4496..3cefb48 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 23e4496..3cefb48 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 d2a1512..1039c9f 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 1bfeffd..c8f8575 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 3114760..f042818 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 6ac8066..45c0150 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 67e71a6..f7d8eac 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 f549204..1dcb050 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 cdc955d..832f545 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 bb5c090..53bfcb1 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 f028366..5b72f93 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 0dbed9b..610d2b1 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 467fa8f..53883e1 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 8bdf7d9..f0d1654 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 f028366..5b72f93 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 b422f05..919e523 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 b422f05..919e523 100755
--- a/bin/arm-eabi-gcc-4.7
+++ b/bin/arm-eabi-gcc-4.7
Binary files differ
diff --git a/bin/arm-eabi-gcc-ar b/bin/arm-eabi-gcc-ar
index f7e41b9..fe862bb 100755
--- a/bin/arm-eabi-gcc-ar
+++ b/bin/arm-eabi-gcc-ar
Binary files differ
diff --git a/bin/arm-eabi-gcc-nm b/bin/arm-eabi-gcc-nm
index db107ab..7ba8154 100755
--- a/bin/arm-eabi-gcc-nm
+++ b/bin/arm-eabi-gcc-nm
Binary files differ
diff --git a/bin/arm-eabi-gcc-ranlib b/bin/arm-eabi-gcc-ranlib
index 64126e6..97d9d69 100755
--- a/bin/arm-eabi-gcc-ranlib
+++ b/bin/arm-eabi-gcc-ranlib
Binary files differ
diff --git a/bin/arm-eabi-gcov b/bin/arm-eabi-gcov
index 12f3591..011cac7 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 4eb7126..bc8d5d6 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 f0ac014..cf56a08 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 513dfc7..101fcc3 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 23e4496..3cefb48 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 23e4496..3cefb48 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 d2a1512..1039c9f 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 1bfeffd..c8f8575 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 3114760..f042818 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 6ac8066..45c0150 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 a2aaba9..151c552 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 bf507e0..68262b0 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 27ee56d..9aa502a 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 0dff5b0..0d026ae 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 67e71a6..f7d8eac 100755
--- a/bin/arm-eabi-strip
+++ b/bin/arm-eabi-strip
Binary files differ
diff --git a/lib/gcc/arm-eabi/4.7/include-fixed/stdio.h b/lib/gcc/arm-eabi/4.7/include-fixed/stdio.h
index b4de0f9..9083d91 100644
--- a/lib/gcc/arm-eabi/4.7/include-fixed/stdio.h
+++ b/lib/gcc/arm-eabi/4.7/include-fixed/stdio.h
@@ -2,7 +2,7 @@
 
     It has been auto-edited by fixincludes from:
 
-	"/tmp/toolchain-build-eabi-4.7/prefix/sysroot/usr/include/stdio.h"
+	"/tmp/toolchain-build-eabi/prefix/sysroot/usr/include/stdio.h"
 
     This had to be done to correct non-standard usages in the
     original, manufacturer supplied header file.  */
diff --git a/lib/gcc/arm-eabi/4.7/include-fixed/sys/types.h b/lib/gcc/arm-eabi/4.7/include-fixed/sys/types.h
index ed0b4dd..4ba4dea 100644
--- a/lib/gcc/arm-eabi/4.7/include-fixed/sys/types.h
+++ b/lib/gcc/arm-eabi/4.7/include-fixed/sys/types.h
@@ -2,7 +2,7 @@
 
     It has been auto-edited by fixincludes from:
 
-	"/tmp/toolchain-build-eabi-4.7/prefix/sysroot/usr/include/sys/types.h"
+	"/tmp/toolchain-build-eabi/prefix/sysroot/usr/include/sys/types.h"
 
     This had to be done to correct non-standard usages in the
     original, manufacturer supplied header file.  */
diff --git a/lib/gcc/arm-eabi/4.7/libgcc.a b/lib/gcc/arm-eabi/4.7/libgcc.a
index d9bd126..856f0de 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 a772551..7fd7f5d 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..3b2498d
--- /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..58942c4
--- /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..ced2d96
--- /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..fb5b537
--- /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 9eea9bb..4eb7484 100644
--- a/lib/libarm-linux-android-sim.a
+++ b/lib/libarm-linux-android-sim.a
Binary files differ
diff --git a/lib32/libbfd.a b/lib32/libbfd.a
index d937d0f..f4639fd 100644
--- a/lib32/libbfd.a
+++ b/lib32/libbfd.a
Binary files differ
diff --git a/lib32/libbfd.la b/lib32/libbfd.la
index 9e02f64..a38a4f6 100755
--- a/lib32/libbfd.la
+++ b/lib32/libbfd.la
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/tmp/toolchain-build-eabi-4.7/prefix/x86_64-pc-linux-gnu/arm-eabi/lib'
+libdir='/tmp/toolchain-build-eabi/prefix/x86_64-pc-linux-gnu/arm-eabi/lib'
diff --git a/lib32/libiberty.a b/lib32/libiberty.a
index 5620df8..b6c8bf2 100644
--- a/lib32/libiberty.a
+++ b/lib32/libiberty.a
Binary files differ
diff --git a/lib32/libintl.a b/lib32/libintl.a
index 0acc76d..c3e6c89 100644
--- a/lib32/libintl.a
+++ b/lib32/libintl.a
Binary files differ
diff --git a/lib64/libiberty.a b/lib64/libiberty.a
index b734340..fb3b65b 100644
--- a/lib64/libiberty.a
+++ b/lib64/libiberty.a
Binary files differ
diff --git a/libexec/gcc/arm-eabi/4.7/cc1 b/libexec/gcc/arm-eabi/4.7/cc1
index 3001a7d..270f897 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 5710078..9d5d4ce 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 abf6014..5e00e94 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/liblto_plugin.la b/libexec/gcc/arm-eabi/4.7/liblto_plugin.la
index 22d9a16..7c14bb3 100755
--- a/libexec/gcc/arm-eabi/4.7/liblto_plugin.la
+++ b/libexec/gcc/arm-eabi/4.7/liblto_plugin.la
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/tmp/toolchain-build-eabi-4.7/prefix/libexec/gcc/arm-eabi/4.7'
+libdir='/tmp/toolchain-build-eabi/prefix/libexec/gcc/arm-eabi/4.7'
diff --git a/libexec/gcc/arm-eabi/4.7/lto-wrapper b/libexec/gcc/arm-eabi/4.7/lto-wrapper
index 0268c51..9be5751 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 cc1592c..9da0372 100755
--- a/libexec/gcc/arm-eabi/4.7/lto1
+++ b/libexec/gcc/arm-eabi/4.7/lto1
Binary files differ