diff --git a/SOURCES b/SOURCES
index 5bfae6b..369b0df 100644
--- a/SOURCES
+++ b/SOURCES
@@ -1,8 +1,8 @@
-toolchain/build.git              6d144f8edfd3879d3c241713331460d9a6e3ee86 Allow --enable-gold co-exists with --enable-ld=default
+toolchain/build.git              89f41cc2452f2c3ab645a35db0aa5bf6cba0795d Disable python support for gdb-7.x
 toolchain/gmp.git                e6b9669dafc6a5f83c80b4b4176359b78bccdc90 Add gmp-5.0.5.tar.bz2
 toolchain/mpfr.git               bde731396c38c8d5b0bca800aace6a690d0d2978 add mpfr-2.4.2.tar.bz2
 toolchain/mpc.git                a4109ccc6e07f72f41c397a17fdfbed3e5e19c66 Add mpc-0.8.1 package to toolchain source.
 toolchain/expat.git              40172a0ae9d40a068f1e1a48ffcf6a1ccf765ed5 expat package for building gdb-7.3
-toolchain/binutils.git           e7891a8a63d5c3eb3bfd3e2d3a94a05438a43373 Fixed binutils-2.21/gold build in MacOSX
-toolchain/gcc.git                5f2f4ef69e2f64970aad2c303a529c49789021d8 2012-05-18   Jing Yu  <jingyu@google.com>
-toolchain/gdb.git                b3007e980fad8bf4fc0fca1d3823aff648339798 Patch GDB 6.6 and 7.1.x to understand linux-android
+toolchain/binutils.git           68ba60c0e44c1187cb582474ebb001d95a7170f6 Fix ld.gold i586-mingw32msvc
+toolchain/gcc.git                7d5fc224ccdfdf562f6c2714d8d108453c46fe39 Backport from trunk r186788: Define USE_PT_GNU_EH_FRAME.
+toolchain/gdb.git                ccddbccc8f41940aa30324b4aa2d8933159575b7 Fix gdb 7.3.x build on Windows
diff --git a/bin/i686-linux-android-addr2line b/bin/i686-linux-android-addr2line
index 63036ac..525641e 100755
--- a/bin/i686-linux-android-addr2line
+++ b/bin/i686-linux-android-addr2line
Binary files differ
diff --git a/bin/i686-linux-android-ar b/bin/i686-linux-android-ar
index 8668ba5..8f197ca 100755
--- a/bin/i686-linux-android-ar
+++ b/bin/i686-linux-android-ar
Binary files differ
diff --git a/bin/i686-linux-android-as b/bin/i686-linux-android-as
index 72b036b..eb66646 100755
--- a/bin/i686-linux-android-as
+++ b/bin/i686-linux-android-as
Binary files differ
diff --git a/bin/i686-linux-android-c++ b/bin/i686-linux-android-c++
index a9adabf..203e6b5 100755
--- a/bin/i686-linux-android-c++
+++ b/bin/i686-linux-android-c++
Binary files differ
diff --git a/bin/i686-linux-android-c++filt b/bin/i686-linux-android-c++filt
index 01894fb..ff9cc6b 100755
--- a/bin/i686-linux-android-c++filt
+++ b/bin/i686-linux-android-c++filt
Binary files differ
diff --git a/bin/i686-linux-android-cpp b/bin/i686-linux-android-cpp
index 9c6a1d0..2bd03a6 100755
--- a/bin/i686-linux-android-cpp
+++ b/bin/i686-linux-android-cpp
Binary files differ
diff --git a/bin/i686-linux-android-g++ b/bin/i686-linux-android-g++
index a9adabf..203e6b5 100755
--- a/bin/i686-linux-android-g++
+++ b/bin/i686-linux-android-g++
Binary files differ
diff --git a/bin/i686-linux-android-gcc b/bin/i686-linux-android-gcc
index 8aacd11..f3170d5 100755
--- a/bin/i686-linux-android-gcc
+++ b/bin/i686-linux-android-gcc
Binary files differ
diff --git a/bin/i686-linux-android-gcc-4.6 b/bin/i686-linux-android-gcc-4.6
new file mode 100755
index 0000000..f3170d5
--- /dev/null
+++ b/bin/i686-linux-android-gcc-4.6
Binary files differ
diff --git a/bin/i686-linux-android-gcc-4.6.x-google b/bin/i686-linux-android-gcc-4.6.x-google
deleted file mode 100755
index 8aacd11..0000000
--- a/bin/i686-linux-android-gcc-4.6.x-google
+++ /dev/null
Binary files differ
diff --git a/bin/i686-linux-android-gcov b/bin/i686-linux-android-gcov
index 6f59db7..53157fe 100755
--- a/bin/i686-linux-android-gcov
+++ b/bin/i686-linux-android-gcov
Binary files differ
diff --git a/bin/i686-linux-android-gdb b/bin/i686-linux-android-gdb
index 1dd40b8..15ce7ed 100755
--- a/bin/i686-linux-android-gdb
+++ b/bin/i686-linux-android-gdb
Binary files differ
diff --git a/bin/i686-linux-android-gdbtui b/bin/i686-linux-android-gdbtui
index a45bfde..0e31fc8 100755
--- a/bin/i686-linux-android-gdbtui
+++ b/bin/i686-linux-android-gdbtui
Binary files differ
diff --git a/bin/i686-linux-android-gprof b/bin/i686-linux-android-gprof
index fc01b90..9913eaf 100755
--- a/bin/i686-linux-android-gprof
+++ b/bin/i686-linux-android-gprof
Binary files differ
diff --git a/bin/i686-linux-android-ld b/bin/i686-linux-android-ld
index 6de832a..db20146 100755
--- a/bin/i686-linux-android-ld
+++ b/bin/i686-linux-android-ld
Binary files differ
diff --git a/bin/i686-linux-android-ld.bfd b/bin/i686-linux-android-ld.bfd
index 6de832a..1f4a16a 100755
--- a/bin/i686-linux-android-ld.bfd
+++ b/bin/i686-linux-android-ld.bfd
Binary files differ
diff --git a/bin/i686-linux-android-ld.gold b/bin/i686-linux-android-ld.gold
index dfe7428..db20146 100755
--- a/bin/i686-linux-android-ld.gold
+++ b/bin/i686-linux-android-ld.gold
Binary files differ
diff --git a/bin/i686-linux-android-nm b/bin/i686-linux-android-nm
index 680f086..429bf92 100755
--- a/bin/i686-linux-android-nm
+++ b/bin/i686-linux-android-nm
Binary files differ
diff --git a/bin/i686-linux-android-objcopy b/bin/i686-linux-android-objcopy
index 336dc1b..3e9d2bd 100755
--- a/bin/i686-linux-android-objcopy
+++ b/bin/i686-linux-android-objcopy
Binary files differ
diff --git a/bin/i686-linux-android-objdump b/bin/i686-linux-android-objdump
index 000417e..e5f69c7 100755
--- a/bin/i686-linux-android-objdump
+++ b/bin/i686-linux-android-objdump
Binary files differ
diff --git a/bin/i686-linux-android-ranlib b/bin/i686-linux-android-ranlib
index 99a8478..25b8ddc 100755
--- a/bin/i686-linux-android-ranlib
+++ b/bin/i686-linux-android-ranlib
Binary files differ
diff --git a/bin/i686-linux-android-size b/bin/i686-linux-android-size
index 7a04a81..ccd6f58 100755
--- a/bin/i686-linux-android-size
+++ b/bin/i686-linux-android-size
Binary files differ
diff --git a/bin/i686-linux-android-strings b/bin/i686-linux-android-strings
index ce75eee..2a32b0d 100755
--- a/bin/i686-linux-android-strings
+++ b/bin/i686-linux-android-strings
Binary files differ
diff --git a/bin/i686-linux-android-strip b/bin/i686-linux-android-strip
index c632675..7b0cc10 100755
--- a/bin/i686-linux-android-strip
+++ b/bin/i686-linux-android-strip
Binary files differ
diff --git a/i686-linux-android/bin/ar b/i686-linux-android/bin/ar
index 8668ba5..8f197ca 100755
--- a/i686-linux-android/bin/ar
+++ b/i686-linux-android/bin/ar
Binary files differ
diff --git a/i686-linux-android/bin/as b/i686-linux-android/bin/as
index 72b036b..eb66646 100755
--- a/i686-linux-android/bin/as
+++ b/i686-linux-android/bin/as
Binary files differ
diff --git a/i686-linux-android/bin/c++ b/i686-linux-android/bin/c++
index a9adabf..203e6b5 100755
--- a/i686-linux-android/bin/c++
+++ b/i686-linux-android/bin/c++
Binary files differ
diff --git a/i686-linux-android/bin/g++ b/i686-linux-android/bin/g++
index a9adabf..203e6b5 100755
--- a/i686-linux-android/bin/g++
+++ b/i686-linux-android/bin/g++
Binary files differ
diff --git a/i686-linux-android/bin/gcc b/i686-linux-android/bin/gcc
index 8aacd11..f3170d5 100755
--- a/i686-linux-android/bin/gcc
+++ b/i686-linux-android/bin/gcc
Binary files differ
diff --git a/i686-linux-android/bin/ld b/i686-linux-android/bin/ld
index 6de832a..db20146 100755
--- a/i686-linux-android/bin/ld
+++ b/i686-linux-android/bin/ld
Binary files differ
diff --git a/i686-linux-android/bin/ld.bfd b/i686-linux-android/bin/ld.bfd
index 6de832a..1f4a16a 100755
--- a/i686-linux-android/bin/ld.bfd
+++ b/i686-linux-android/bin/ld.bfd
Binary files differ
diff --git a/i686-linux-android/bin/ld.gold b/i686-linux-android/bin/ld.gold
index dfe7428..db20146 100755
--- a/i686-linux-android/bin/ld.gold
+++ b/i686-linux-android/bin/ld.gold
Binary files differ
diff --git a/i686-linux-android/bin/nm b/i686-linux-android/bin/nm
index 680f086..429bf92 100755
--- a/i686-linux-android/bin/nm
+++ b/i686-linux-android/bin/nm
Binary files differ
diff --git a/i686-linux-android/bin/objcopy b/i686-linux-android/bin/objcopy
index 336dc1b..3e9d2bd 100755
--- a/i686-linux-android/bin/objcopy
+++ b/i686-linux-android/bin/objcopy
Binary files differ
diff --git a/i686-linux-android/bin/objdump b/i686-linux-android/bin/objdump
index 000417e..e5f69c7 100755
--- a/i686-linux-android/bin/objdump
+++ b/i686-linux-android/bin/objdump
Binary files differ
diff --git a/i686-linux-android/bin/ranlib b/i686-linux-android/bin/ranlib
index 99a8478..25b8ddc 100755
--- a/i686-linux-android/bin/ranlib
+++ b/i686-linux-android/bin/ranlib
Binary files differ
diff --git a/i686-linux-android/bin/strip b/i686-linux-android/bin/strip
index c632675..7b0cc10 100755
--- a/i686-linux-android/bin/strip
+++ b/i686-linux-android/bin/strip
Binary files differ
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/crtbegin.o b/lib/gcc/i686-linux-android/4.6.x-google/crtbegin.o
deleted file mode 100644
index aa9b62b..0000000
--- a/lib/gcc/i686-linux-android/4.6.x-google/crtbegin.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/crtbeginS.o b/lib/gcc/i686-linux-android/4.6.x-google/crtbeginS.o
deleted file mode 100644
index 99d1e5c..0000000
--- a/lib/gcc/i686-linux-android/4.6.x-google/crtbeginS.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/crtbeginT.o b/lib/gcc/i686-linux-android/4.6.x-google/crtbeginT.o
deleted file mode 100644
index aa9b62b..0000000
--- a/lib/gcc/i686-linux-android/4.6.x-google/crtbeginT.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/crtend.o b/lib/gcc/i686-linux-android/4.6.x-google/crtend.o
deleted file mode 100644
index ef74805..0000000
--- a/lib/gcc/i686-linux-android/4.6.x-google/crtend.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/crtendS.o b/lib/gcc/i686-linux-android/4.6.x-google/crtendS.o
deleted file mode 100644
index ef74805..0000000
--- a/lib/gcc/i686-linux-android/4.6.x-google/crtendS.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/crtfastmath.o b/lib/gcc/i686-linux-android/4.6.x-google/crtfastmath.o
deleted file mode 100644
index 698b32e..0000000
--- a/lib/gcc/i686-linux-android/4.6.x-google/crtfastmath.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/crtprec32.o b/lib/gcc/i686-linux-android/4.6.x-google/crtprec32.o
deleted file mode 100644
index b45a15b..0000000
--- a/lib/gcc/i686-linux-android/4.6.x-google/crtprec32.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/crtprec64.o b/lib/gcc/i686-linux-android/4.6.x-google/crtprec64.o
deleted file mode 100644
index c6dd43b..0000000
--- a/lib/gcc/i686-linux-android/4.6.x-google/crtprec64.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/crtprec80.o b/lib/gcc/i686-linux-android/4.6.x-google/crtprec80.o
deleted file mode 100644
index 5bef2da..0000000
--- a/lib/gcc/i686-linux-android/4.6.x-google/crtprec80.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/i686-linux-android/4.6/crtbegin.o b/lib/gcc/i686-linux-android/4.6/crtbegin.o
new file mode 100644
index 0000000..59617ed
--- /dev/null
+++ b/lib/gcc/i686-linux-android/4.6/crtbegin.o
Binary files differ
diff --git a/lib/gcc/i686-linux-android/4.6/crtbeginS.o b/lib/gcc/i686-linux-android/4.6/crtbeginS.o
new file mode 100644
index 0000000..b25e395
--- /dev/null
+++ b/lib/gcc/i686-linux-android/4.6/crtbeginS.o
Binary files differ
diff --git a/lib/gcc/i686-linux-android/4.6/crtbeginT.o b/lib/gcc/i686-linux-android/4.6/crtbeginT.o
new file mode 100644
index 0000000..59617ed
--- /dev/null
+++ b/lib/gcc/i686-linux-android/4.6/crtbeginT.o
Binary files differ
diff --git a/lib/gcc/i686-linux-android/4.6/crtend.o b/lib/gcc/i686-linux-android/4.6/crtend.o
new file mode 100644
index 0000000..e9eaf9d
--- /dev/null
+++ b/lib/gcc/i686-linux-android/4.6/crtend.o
Binary files differ
diff --git a/lib/gcc/i686-linux-android/4.6/crtendS.o b/lib/gcc/i686-linux-android/4.6/crtendS.o
new file mode 100644
index 0000000..e9eaf9d
--- /dev/null
+++ b/lib/gcc/i686-linux-android/4.6/crtendS.o
Binary files differ
diff --git a/lib/gcc/i686-linux-android/4.6/crtfastmath.o b/lib/gcc/i686-linux-android/4.6/crtfastmath.o
new file mode 100644
index 0000000..a77c027
--- /dev/null
+++ b/lib/gcc/i686-linux-android/4.6/crtfastmath.o
Binary files differ
diff --git a/lib/gcc/i686-linux-android/4.6/crtprec32.o b/lib/gcc/i686-linux-android/4.6/crtprec32.o
new file mode 100644
index 0000000..7ec3369
--- /dev/null
+++ b/lib/gcc/i686-linux-android/4.6/crtprec32.o
Binary files differ
diff --git a/lib/gcc/i686-linux-android/4.6/crtprec64.o b/lib/gcc/i686-linux-android/4.6/crtprec64.o
new file mode 100644
index 0000000..a0fb604
--- /dev/null
+++ b/lib/gcc/i686-linux-android/4.6/crtprec64.o
Binary files differ
diff --git a/lib/gcc/i686-linux-android/4.6/crtprec80.o b/lib/gcc/i686-linux-android/4.6/crtprec80.o
new file mode 100644
index 0000000..d3c4532
--- /dev/null
+++ b/lib/gcc/i686-linux-android/4.6/crtprec80.o
Binary files differ
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/gcov-src/gcov-io.c b/lib/gcc/i686-linux-android/4.6/gcov-src/gcov-io.c
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/gcov-src/gcov-io.c
rename to lib/gcc/i686-linux-android/4.6/gcov-src/gcov-io.c
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/gcov-src/gcov-io.h b/lib/gcc/i686-linux-android/4.6/gcov-src/gcov-io.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/gcov-src/gcov-io.h
rename to lib/gcc/i686-linux-android/4.6/gcov-src/gcov-io.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/gcov-src/gcov-iov.h b/lib/gcc/i686-linux-android/4.6/gcov-src/gcov-iov.h
similarity index 69%
rename from lib/gcc/i686-linux-android/4.6.x-google/gcov-src/gcov-iov.h
rename to lib/gcc/i686-linux-android/4.6/gcov-src/gcov-iov.h
index 5a641bc..3c8c9ef 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/gcov-src/gcov-iov.h
+++ b/lib/gcc/i686-linux-android/4.6/gcov-src/gcov-iov.h
@@ -1,4 +1,4 @@
 /* Generated automatically by the program `build/gcov-iov'
-   from `4.6.x-google (4 6) and prerelease (p)'.  */
+   from `4.6 (4 6) and prerelease (p)'.  */
 
 #define GCOV_VERSION ((gcov_unsigned_t)0x34303670)  /* 406p */
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/gcov-src/libgcov.c b/lib/gcc/i686-linux-android/4.6/gcov-src/libgcov.c
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/gcov-src/libgcov.c
rename to lib/gcc/i686-linux-android/4.6/gcov-src/libgcov.c
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include-fixed/README b/lib/gcc/i686-linux-android/4.6/include-fixed/README
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include-fixed/README
rename to lib/gcc/i686-linux-android/4.6/include-fixed/README
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include-fixed/asm/posix_types.h b/lib/gcc/i686-linux-android/4.6/include-fixed/asm/posix_types.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include-fixed/asm/posix_types.h
rename to lib/gcc/i686-linux-android/4.6/include-fixed/asm/posix_types.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include-fixed/limits.h b/lib/gcc/i686-linux-android/4.6/include-fixed/limits.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include-fixed/limits.h
rename to lib/gcc/i686-linux-android/4.6/include-fixed/limits.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include-fixed/linux/a.out.h b/lib/gcc/i686-linux-android/4.6/include-fixed/linux/a.out.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include-fixed/linux/a.out.h
rename to lib/gcc/i686-linux-android/4.6/include-fixed/linux/a.out.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include-fixed/stdio.h b/lib/gcc/i686-linux-android/4.6/include-fixed/stdio.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include-fixed/stdio.h
rename to lib/gcc/i686-linux-android/4.6/include-fixed/stdio.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include-fixed/sys/types.h b/lib/gcc/i686-linux-android/4.6/include-fixed/sys/types.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include-fixed/sys/types.h
rename to lib/gcc/i686-linux-android/4.6/include-fixed/sys/types.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include-fixed/syslimits.h b/lib/gcc/i686-linux-android/4.6/include-fixed/syslimits.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include-fixed/syslimits.h
rename to lib/gcc/i686-linux-android/4.6/include-fixed/syslimits.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/abmintrin.h b/lib/gcc/i686-linux-android/4.6/include/abmintrin.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/abmintrin.h
rename to lib/gcc/i686-linux-android/4.6/include/abmintrin.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/ammintrin.h b/lib/gcc/i686-linux-android/4.6/include/ammintrin.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/ammintrin.h
rename to lib/gcc/i686-linux-android/4.6/include/ammintrin.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/avxintrin.h b/lib/gcc/i686-linux-android/4.6/include/avxintrin.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/avxintrin.h
rename to lib/gcc/i686-linux-android/4.6/include/avxintrin.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/bmiintrin.h b/lib/gcc/i686-linux-android/4.6/include/bmiintrin.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/bmiintrin.h
rename to lib/gcc/i686-linux-android/4.6/include/bmiintrin.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/bmmintrin.h b/lib/gcc/i686-linux-android/4.6/include/bmmintrin.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/bmmintrin.h
rename to lib/gcc/i686-linux-android/4.6/include/bmmintrin.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/cpuid.h b/lib/gcc/i686-linux-android/4.6/include/cpuid.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/cpuid.h
rename to lib/gcc/i686-linux-android/4.6/include/cpuid.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/cross-stdarg.h b/lib/gcc/i686-linux-android/4.6/include/cross-stdarg.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/cross-stdarg.h
rename to lib/gcc/i686-linux-android/4.6/include/cross-stdarg.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/emmintrin.h b/lib/gcc/i686-linux-android/4.6/include/emmintrin.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/emmintrin.h
rename to lib/gcc/i686-linux-android/4.6/include/emmintrin.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/float.h b/lib/gcc/i686-linux-android/4.6/include/float.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/float.h
rename to lib/gcc/i686-linux-android/4.6/include/float.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/fma4intrin.h b/lib/gcc/i686-linux-android/4.6/include/fma4intrin.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/fma4intrin.h
rename to lib/gcc/i686-linux-android/4.6/include/fma4intrin.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/ia32intrin.h b/lib/gcc/i686-linux-android/4.6/include/ia32intrin.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/ia32intrin.h
rename to lib/gcc/i686-linux-android/4.6/include/ia32intrin.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/immintrin.h b/lib/gcc/i686-linux-android/4.6/include/immintrin.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/immintrin.h
rename to lib/gcc/i686-linux-android/4.6/include/immintrin.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/iso646.h b/lib/gcc/i686-linux-android/4.6/include/iso646.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/iso646.h
rename to lib/gcc/i686-linux-android/4.6/include/iso646.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/lwpintrin.h b/lib/gcc/i686-linux-android/4.6/include/lwpintrin.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/lwpintrin.h
rename to lib/gcc/i686-linux-android/4.6/include/lwpintrin.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/mm3dnow.h b/lib/gcc/i686-linux-android/4.6/include/mm3dnow.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/mm3dnow.h
rename to lib/gcc/i686-linux-android/4.6/include/mm3dnow.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/mm_malloc.h b/lib/gcc/i686-linux-android/4.6/include/mm_malloc.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/mm_malloc.h
rename to lib/gcc/i686-linux-android/4.6/include/mm_malloc.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/mmintrin.h b/lib/gcc/i686-linux-android/4.6/include/mmintrin.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/mmintrin.h
rename to lib/gcc/i686-linux-android/4.6/include/mmintrin.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/nmmintrin.h b/lib/gcc/i686-linux-android/4.6/include/nmmintrin.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/nmmintrin.h
rename to lib/gcc/i686-linux-android/4.6/include/nmmintrin.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/pmmintrin.h b/lib/gcc/i686-linux-android/4.6/include/pmmintrin.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/pmmintrin.h
rename to lib/gcc/i686-linux-android/4.6/include/pmmintrin.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/popcntintrin.h b/lib/gcc/i686-linux-android/4.6/include/popcntintrin.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/popcntintrin.h
rename to lib/gcc/i686-linux-android/4.6/include/popcntintrin.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/smmintrin.h b/lib/gcc/i686-linux-android/4.6/include/smmintrin.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/smmintrin.h
rename to lib/gcc/i686-linux-android/4.6/include/smmintrin.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/stdarg.h b/lib/gcc/i686-linux-android/4.6/include/stdarg.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/stdarg.h
rename to lib/gcc/i686-linux-android/4.6/include/stdarg.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/stdbool.h b/lib/gcc/i686-linux-android/4.6/include/stdbool.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/stdbool.h
rename to lib/gcc/i686-linux-android/4.6/include/stdbool.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/stddef.h b/lib/gcc/i686-linux-android/4.6/include/stddef.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/stddef.h
rename to lib/gcc/i686-linux-android/4.6/include/stddef.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/stdfix.h b/lib/gcc/i686-linux-android/4.6/include/stdfix.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/stdfix.h
rename to lib/gcc/i686-linux-android/4.6/include/stdfix.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/stdint-gcc.h b/lib/gcc/i686-linux-android/4.6/include/stdint-gcc.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/stdint-gcc.h
rename to lib/gcc/i686-linux-android/4.6/include/stdint-gcc.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/stdint.h b/lib/gcc/i686-linux-android/4.6/include/stdint.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/stdint.h
rename to lib/gcc/i686-linux-android/4.6/include/stdint.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/tbmintrin.h b/lib/gcc/i686-linux-android/4.6/include/tbmintrin.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/tbmintrin.h
rename to lib/gcc/i686-linux-android/4.6/include/tbmintrin.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/tmmintrin.h b/lib/gcc/i686-linux-android/4.6/include/tmmintrin.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/tmmintrin.h
rename to lib/gcc/i686-linux-android/4.6/include/tmmintrin.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/unwind.h b/lib/gcc/i686-linux-android/4.6/include/unwind.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/unwind.h
rename to lib/gcc/i686-linux-android/4.6/include/unwind.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/varargs.h b/lib/gcc/i686-linux-android/4.6/include/varargs.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/varargs.h
rename to lib/gcc/i686-linux-android/4.6/include/varargs.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/wmmintrin.h b/lib/gcc/i686-linux-android/4.6/include/wmmintrin.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/wmmintrin.h
rename to lib/gcc/i686-linux-android/4.6/include/wmmintrin.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/x86intrin.h b/lib/gcc/i686-linux-android/4.6/include/x86intrin.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/x86intrin.h
rename to lib/gcc/i686-linux-android/4.6/include/x86intrin.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/xmmintrin.h b/lib/gcc/i686-linux-android/4.6/include/xmmintrin.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/xmmintrin.h
rename to lib/gcc/i686-linux-android/4.6/include/xmmintrin.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/include/xopintrin.h b/lib/gcc/i686-linux-android/4.6/include/xopintrin.h
similarity index 100%
rename from lib/gcc/i686-linux-android/4.6.x-google/include/xopintrin.h
rename to lib/gcc/i686-linux-android/4.6/include/xopintrin.h
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/libgcc.a b/lib/gcc/i686-linux-android/4.6/libgcc.a
similarity index 83%
rename from lib/gcc/i686-linux-android/4.6.x-google/libgcc.a
rename to lib/gcc/i686-linux-android/4.6/libgcc.a
index 27fde9c..b9480fe 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/libgcc.a
+++ b/lib/gcc/i686-linux-android/4.6/libgcc.a
Binary files differ
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/libgcov.a b/lib/gcc/i686-linux-android/4.6/libgcov.a
similarity index 64%
rename from lib/gcc/i686-linux-android/4.6.x-google/libgcov.a
rename to lib/gcc/i686-linux-android/4.6/libgcov.a
index c66b730..91c2281 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/libgcov.a
+++ b/lib/gcc/i686-linux-android/4.6/libgcov.a
Binary files differ
diff --git a/lib/libiberty.a b/lib/libiberty.a
index 044771c..8753a5e 100644
--- a/lib/libiberty.a
+++ b/lib/libiberty.a
Binary files differ
diff --git a/lib32/libbfd.a b/lib32/libbfd.a
index f203508..4bd9193 100644
--- a/lib32/libbfd.a
+++ b/lib32/libbfd.a
Binary files differ
diff --git a/lib32/libintl.a b/lib32/libintl.a
index 993a555..b851885 100644
--- a/lib32/libintl.a
+++ b/lib32/libintl.a
Binary files differ
diff --git a/libexec/gcc/i686-linux-android/4.6.x-google/cc1 b/libexec/gcc/i686-linux-android/4.6.x-google/cc1
deleted file mode 100755
index ac9be5a..0000000
--- a/libexec/gcc/i686-linux-android/4.6.x-google/cc1
+++ /dev/null
Binary files differ
diff --git a/libexec/gcc/i686-linux-android/4.6.x-google/cc1plus b/libexec/gcc/i686-linux-android/4.6.x-google/cc1plus
deleted file mode 100755
index e073e53..0000000
--- a/libexec/gcc/i686-linux-android/4.6.x-google/cc1plus
+++ /dev/null
Binary files differ
diff --git a/libexec/gcc/i686-linux-android/4.6.x-google/collect2 b/libexec/gcc/i686-linux-android/4.6.x-google/collect2
deleted file mode 100755
index f9189cf..0000000
--- a/libexec/gcc/i686-linux-android/4.6.x-google/collect2
+++ /dev/null
Binary files differ
diff --git a/libexec/gcc/i686-linux-android/4.6.x-google/lto1 b/libexec/gcc/i686-linux-android/4.6.x-google/lto1
deleted file mode 100755
index 7f638de..0000000
--- a/libexec/gcc/i686-linux-android/4.6.x-google/lto1
+++ /dev/null
Binary files differ
diff --git a/libexec/gcc/i686-linux-android/4.6/cc1 b/libexec/gcc/i686-linux-android/4.6/cc1
new file mode 100755
index 0000000..d27db4c
--- /dev/null
+++ b/libexec/gcc/i686-linux-android/4.6/cc1
Binary files differ
diff --git a/libexec/gcc/i686-linux-android/4.6/cc1plus b/libexec/gcc/i686-linux-android/4.6/cc1plus
new file mode 100755
index 0000000..afdddd9
--- /dev/null
+++ b/libexec/gcc/i686-linux-android/4.6/cc1plus
Binary files differ
diff --git a/libexec/gcc/i686-linux-android/4.6/collect2 b/libexec/gcc/i686-linux-android/4.6/collect2
new file mode 100755
index 0000000..e8cece3
--- /dev/null
+++ b/libexec/gcc/i686-linux-android/4.6/collect2
Binary files differ
diff --git a/libexec/gcc/i686-linux-android/4.6.x-google/libfunction_reordering_plugin.la b/libexec/gcc/i686-linux-android/4.6/libfunction_reordering_plugin.la
similarity index 96%
rename from libexec/gcc/i686-linux-android/4.6.x-google/libfunction_reordering_plugin.la
rename to libexec/gcc/i686-linux-android/4.6/libfunction_reordering_plugin.la
index 8279fc1..ffc2506 100755
--- a/libexec/gcc/i686-linux-android/4.6.x-google/libfunction_reordering_plugin.la
+++ b/libexec/gcc/i686-linux-android/4.6/libfunction_reordering_plugin.la
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/tmp/ndk-andrewhsieh/build/toolchain/prefix/libexec/gcc/i686-linux-android/4.6.x-google'
+libdir='/tmp/ndk-andrewhsieh/build/toolchain/prefix/libexec/gcc/i686-linux-android/4.6'
diff --git a/libexec/gcc/i686-linux-android/4.6.x-google/libfunction_reordering_plugin.so b/libexec/gcc/i686-linux-android/4.6/libfunction_reordering_plugin.so
similarity index 100%
rename from libexec/gcc/i686-linux-android/4.6.x-google/libfunction_reordering_plugin.so
rename to libexec/gcc/i686-linux-android/4.6/libfunction_reordering_plugin.so
diff --git a/libexec/gcc/i686-linux-android/4.6.x-google/libfunction_reordering_plugin.so.0 b/libexec/gcc/i686-linux-android/4.6/libfunction_reordering_plugin.so.0
similarity index 100%
rename from libexec/gcc/i686-linux-android/4.6.x-google/libfunction_reordering_plugin.so.0
rename to libexec/gcc/i686-linux-android/4.6/libfunction_reordering_plugin.so.0
diff --git a/libexec/gcc/i686-linux-android/4.6.x-google/libfunction_reordering_plugin.so.0.0.0 b/libexec/gcc/i686-linux-android/4.6/libfunction_reordering_plugin.so.0.0.0
similarity index 100%
rename from libexec/gcc/i686-linux-android/4.6.x-google/libfunction_reordering_plugin.so.0.0.0
rename to libexec/gcc/i686-linux-android/4.6/libfunction_reordering_plugin.so.0.0.0
Binary files differ
diff --git a/libexec/gcc/i686-linux-android/4.6.x-google/liblto_plugin.la b/libexec/gcc/i686-linux-android/4.6/liblto_plugin.la
similarity index 96%
rename from libexec/gcc/i686-linux-android/4.6.x-google/liblto_plugin.la
rename to libexec/gcc/i686-linux-android/4.6/liblto_plugin.la
index 8224396..16d3605 100755
--- a/libexec/gcc/i686-linux-android/4.6.x-google/liblto_plugin.la
+++ b/libexec/gcc/i686-linux-android/4.6/liblto_plugin.la
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/tmp/ndk-andrewhsieh/build/toolchain/prefix/libexec/gcc/i686-linux-android/4.6.x-google'
+libdir='/tmp/ndk-andrewhsieh/build/toolchain/prefix/libexec/gcc/i686-linux-android/4.6'
diff --git a/libexec/gcc/i686-linux-android/4.6.x-google/liblto_plugin.so b/libexec/gcc/i686-linux-android/4.6/liblto_plugin.so
similarity index 100%
rename from libexec/gcc/i686-linux-android/4.6.x-google/liblto_plugin.so
rename to libexec/gcc/i686-linux-android/4.6/liblto_plugin.so
diff --git a/libexec/gcc/i686-linux-android/4.6.x-google/liblto_plugin.so.0 b/libexec/gcc/i686-linux-android/4.6/liblto_plugin.so.0
similarity index 100%
rename from libexec/gcc/i686-linux-android/4.6.x-google/liblto_plugin.so.0
rename to libexec/gcc/i686-linux-android/4.6/liblto_plugin.so.0
diff --git a/libexec/gcc/i686-linux-android/4.6.x-google/liblto_plugin.so.0.0.0 b/libexec/gcc/i686-linux-android/4.6/liblto_plugin.so.0.0.0
similarity index 100%
rename from libexec/gcc/i686-linux-android/4.6.x-google/liblto_plugin.so.0.0.0
rename to libexec/gcc/i686-linux-android/4.6/liblto_plugin.so.0.0.0
Binary files differ
diff --git a/libexec/gcc/i686-linux-android/4.6.x-google/lto-wrapper b/libexec/gcc/i686-linux-android/4.6/lto-wrapper
similarity index 100%
rename from libexec/gcc/i686-linux-android/4.6.x-google/lto-wrapper
rename to libexec/gcc/i686-linux-android/4.6/lto-wrapper
Binary files differ
diff --git a/libexec/gcc/i686-linux-android/4.6/lto1 b/libexec/gcc/i686-linux-android/4.6/lto1
new file mode 100755
index 0000000..ce78bac
--- /dev/null
+++ b/libexec/gcc/i686-linux-android/4.6/lto1
Binary files differ