Merge "Update x86 toolchain i686-linux-android-4.6 (darwin-x86)"android-sdk-support_r11android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-cts-4.2_r2android-cts-4.2_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1tools_r22.2tools_r22tools_r21l-previewkitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devjb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devjb-mr1.1-releasejb-mr1.1-dev-plus-aospjb-mr1.1-devjb-mr1-releasejb-mr1-dev-plus-aospjb-mr1-devidea133-weekly-releaseidea133

115 files changed, 7 insertions, 7 deletions

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 a55ec4e..a394eec 100755
--- a/bin/i686-linux-android-addr2line
+++ b/bin/i686-linux-android-addr2line
diff --git a/bin/i686-linux-android-ar b/bin/i686-linux-android-ar
index 19d4db6..2b61977 100755
--- a/bin/i686-linux-android-ar
+++ b/bin/i686-linux-android-ar
diff --git a/bin/i686-linux-android-as b/bin/i686-linux-android-as
index 03711b8..619e8eb 100755
--- a/bin/i686-linux-android-as
+++ b/bin/i686-linux-android-as
diff --git a/bin/i686-linux-android-c++ b/bin/i686-linux-android-c++
index 1e90166..2ac8fce 100755
--- a/bin/i686-linux-android-c++
+++ b/bin/i686-linux-android-c++
diff --git a/bin/i686-linux-android-c++filt b/bin/i686-linux-android-c++filt
index 8f1d4fe..44ae93b 100755
--- a/bin/i686-linux-android-c++filt
+++ b/bin/i686-linux-android-c++filt
diff --git a/bin/i686-linux-android-cpp b/bin/i686-linux-android-cpp
index ba7233e..bc12443 100755
--- a/bin/i686-linux-android-cpp
+++ b/bin/i686-linux-android-cpp
diff --git a/bin/i686-linux-android-g++ b/bin/i686-linux-android-g++
index 1e90166..2ac8fce 100755
--- a/bin/i686-linux-android-g++
+++ b/bin/i686-linux-android-g++
diff --git a/bin/i686-linux-android-gcc b/bin/i686-linux-android-gcc
index a5a0d4f..cbfeb1a 100755
--- a/bin/i686-linux-android-gcc
+++ b/bin/i686-linux-android-gcc
diff --git a/bin/i686-linux-android-gcc-4.6.x-google b/bin/i686-linux-android-gcc-4.6
index a5a0d4f..cbfeb1a 100755
--- a/bin/i686-linux-android-gcc-4.6.x-google
+++ b/bin/i686-linux-android-gcc-4.6
diff --git a/bin/i686-linux-android-gcov b/bin/i686-linux-android-gcov
index 1a2d4bc..8326682 100755
--- a/bin/i686-linux-android-gcov
+++ b/bin/i686-linux-android-gcov
diff --git a/bin/i686-linux-android-gdb b/bin/i686-linux-android-gdb
index fc21ba3..382f58d 100755
--- a/bin/i686-linux-android-gdb
+++ b/bin/i686-linux-android-gdb
diff --git a/bin/i686-linux-android-gdbtui b/bin/i686-linux-android-gdbtui
index f14e746..c6be96f 100755
--- a/bin/i686-linux-android-gdbtui
+++ b/bin/i686-linux-android-gdbtui
diff --git a/bin/i686-linux-android-gprof b/bin/i686-linux-android-gprof
index 739864c..cee0b57 100755
--- a/bin/i686-linux-android-gprof
+++ b/bin/i686-linux-android-gprof
diff --git a/bin/i686-linux-android-ld b/bin/i686-linux-android-ld
index 348fc72..f2b6015 100755
--- a/bin/i686-linux-android-ld
+++ b/bin/i686-linux-android-ld
diff --git a/bin/i686-linux-android-ld.bfd b/bin/i686-linux-android-ld.bfd
index 348fc72..fad2e93 100755
--- a/bin/i686-linux-android-ld.bfd
+++ b/bin/i686-linux-android-ld.bfd
diff --git a/bin/i686-linux-android-ld.gold b/bin/i686-linux-android-ld.gold
index bfc6aed..f2b6015 100755
--- a/bin/i686-linux-android-ld.gold
+++ b/bin/i686-linux-android-ld.gold
diff --git a/bin/i686-linux-android-nm b/bin/i686-linux-android-nm
index 8c139f8..0a6a6e1 100755
--- a/bin/i686-linux-android-nm
+++ b/bin/i686-linux-android-nm
diff --git a/bin/i686-linux-android-objcopy b/bin/i686-linux-android-objcopy
index 60a0897..ae55795 100755
--- a/bin/i686-linux-android-objcopy
+++ b/bin/i686-linux-android-objcopy
diff --git a/bin/i686-linux-android-objdump b/bin/i686-linux-android-objdump
index 69243a2..66195cb 100755
--- a/bin/i686-linux-android-objdump
+++ b/bin/i686-linux-android-objdump
diff --git a/bin/i686-linux-android-ranlib b/bin/i686-linux-android-ranlib
index e8c0490..2313c33 100755
--- a/bin/i686-linux-android-ranlib
+++ b/bin/i686-linux-android-ranlib
diff --git a/bin/i686-linux-android-size b/bin/i686-linux-android-size
index cc2fef7..0bcce7a 100755
--- a/bin/i686-linux-android-size
+++ b/bin/i686-linux-android-size
diff --git a/bin/i686-linux-android-strings b/bin/i686-linux-android-strings
index f113331..8bbbaff 100755
--- a/bin/i686-linux-android-strings
+++ b/bin/i686-linux-android-strings
diff --git a/bin/i686-linux-android-strip b/bin/i686-linux-android-strip
index 453e7ed..b319586 100755
--- a/bin/i686-linux-android-strip
+++ b/bin/i686-linux-android-strip
diff --git a/i686-linux-android/bin/ar b/i686-linux-android/bin/ar
index 19d4db6..2b61977 100755
--- a/i686-linux-android/bin/ar
+++ b/i686-linux-android/bin/ar
diff --git a/i686-linux-android/bin/as b/i686-linux-android/bin/as
index 03711b8..619e8eb 100755
--- a/i686-linux-android/bin/as
+++ b/i686-linux-android/bin/as
diff --git a/i686-linux-android/bin/c++ b/i686-linux-android/bin/c++
index 1e90166..2ac8fce 100755
--- a/i686-linux-android/bin/c++
+++ b/i686-linux-android/bin/c++
diff --git a/i686-linux-android/bin/g++ b/i686-linux-android/bin/g++
index 1e90166..2ac8fce 100755
--- a/i686-linux-android/bin/g++
+++ b/i686-linux-android/bin/g++
diff --git a/i686-linux-android/bin/gcc b/i686-linux-android/bin/gcc
index a5a0d4f..cbfeb1a 100755
--- a/i686-linux-android/bin/gcc
+++ b/i686-linux-android/bin/gcc
diff --git a/i686-linux-android/bin/ld b/i686-linux-android/bin/ld
index 348fc72..f2b6015 100755
--- a/i686-linux-android/bin/ld
+++ b/i686-linux-android/bin/ld
diff --git a/i686-linux-android/bin/ld.bfd b/i686-linux-android/bin/ld.bfd
index 348fc72..fad2e93 100755
--- a/i686-linux-android/bin/ld.bfd
+++ b/i686-linux-android/bin/ld.bfd
diff --git a/i686-linux-android/bin/ld.gold b/i686-linux-android/bin/ld.gold
index bfc6aed..f2b6015 100755
--- a/i686-linux-android/bin/ld.gold
+++ b/i686-linux-android/bin/ld.gold
diff --git a/i686-linux-android/bin/nm b/i686-linux-android/bin/nm
index 8c139f8..0a6a6e1 100755
--- a/i686-linux-android/bin/nm
+++ b/i686-linux-android/bin/nm
diff --git a/i686-linux-android/bin/objcopy b/i686-linux-android/bin/objcopy
index 60a0897..ae55795 100755
--- a/i686-linux-android/bin/objcopy
+++ b/i686-linux-android/bin/objcopy
diff --git a/i686-linux-android/bin/objdump b/i686-linux-android/bin/objdump
index 69243a2..66195cb 100755
--- a/i686-linux-android/bin/objdump
+++ b/i686-linux-android/bin/objdump
diff --git a/i686-linux-android/bin/ranlib b/i686-linux-android/bin/ranlib
index e8c0490..2313c33 100755
--- a/i686-linux-android/bin/ranlib
+++ b/i686-linux-android/bin/ranlib
diff --git a/i686-linux-android/bin/strip b/i686-linux-android/bin/strip
index 453e7ed..b319586 100755
--- a/i686-linux-android/bin/strip
+++ b/i686-linux-android/bin/strip
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
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
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
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
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 bda45a9..0000000
--- a/lib/gcc/i686-linux-android/4.6.x-google/crtprec32.o
+++ /dev/null
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 07f5844..0000000
--- a/lib/gcc/i686-linux-android/4.6.x-google/crtprec64.o
+++ /dev/null
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 c5c340d..0000000
--- a/lib/gcc/i686-linux-android/4.6.x-google/crtprec80.o
+++ /dev/null
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
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/crtbeginS.o b/lib/gcc/i686-linux-android/4.6/crtbeginS.o
index 99d1e5c..b25e395 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/crtbeginS.o
+++ b/lib/gcc/i686-linux-android/4.6/crtbeginS.o
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
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
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
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/crtfastmath.o b/lib/gcc/i686-linux-android/4.6/crtfastmath.o
index 878bacd..2c42ae6 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/crtfastmath.o
+++ b/lib/gcc/i686-linux-android/4.6/crtfastmath.o
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..5e23637
--- /dev/null
+++ b/lib/gcc/i686-linux-android/4.6/crtprec32.o
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..df1e3ec
--- /dev/null
+++ b/lib/gcc/i686-linux-android/4.6/crtprec64.o
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..06e4ffa
--- /dev/null
+++ b/lib/gcc/i686-linux-android/4.6/crtprec80.o
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
index 61ecd46..61ecd46 100644
--- 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
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
index fe0ae20..fe0ae20 100644
--- 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
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
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
index 613c1f4..613c1f4 100644
--- 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
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
index 7086a77..7086a77 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include-fixed/README
+++ b/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
index 9ff36f5..9ff36f5 100644
--- 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
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
index a1c35e9..a1c35e9 100644
--- 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
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
index 737b879..737b879 100644
--- 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
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
index 3656425..3656425 100644
--- 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
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
index e36e0d8..e36e0d8 100644
--- 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
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
index a362802..a362802 100644
--- 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
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
index 9d87f57..9d87f57 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/abmintrin.h
+++ b/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
index 3647b31..3647b31 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/ammintrin.h
+++ b/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
index 6d4213d..6d4213d 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/avxintrin.h
+++ b/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
index 225f2ec..225f2ec 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/bmiintrin.h
+++ b/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
index 91d4e77..91d4e77 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/bmmintrin.h
+++ b/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
index 3c3f47b..3c3f47b 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/cpuid.h
+++ b/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
index 7139ffa..7139ffa 100644
--- 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
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
index fe4cd6a..fe4cd6a 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/emmintrin.h
+++ b/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
index b78cc0c..b78cc0c 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/float.h
+++ b/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
index ae30bfe..ae30bfe 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/fma4intrin.h
+++ b/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
index 76c20a6..76c20a6 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/ia32intrin.h
+++ b/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
index 11a1a4e..11a1a4e 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/immintrin.h
+++ b/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
index 28ff9d1..28ff9d1 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/iso646.h
+++ b/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
index 954b039..954b039 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/lwpintrin.h
+++ b/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
index 0d0735c..0d0735c 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/mm3dnow.h
+++ b/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
index 0a9f2e2..0a9f2e2 100644
--- 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
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
index 497e22e..497e22e 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/mmintrin.h
+++ b/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
index 2a2d264..2a2d264 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/nmmintrin.h
+++ b/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
index c5c9ae2..c5c9ae2 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/pmmintrin.h
+++ b/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
index 8d4d657..8d4d657 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/popcntintrin.h
+++ b/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
index e12c56a..e12c56a 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/smmintrin.h
+++ b/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
index 54dc2e7..54dc2e7 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/stdarg.h
+++ b/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
index 4ed911f..4ed911f 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/stdbool.h
+++ b/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
index 565ef7b..565ef7b 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/stddef.h
+++ b/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
index 3c3ec00..3c3ec00 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/stdfix.h
+++ b/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
index 22780a1..22780a1 100644
--- 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
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
index e45f819..e45f819 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/stdint.h
+++ b/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
index 8d2431d..8d2431d 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/tbmintrin.h
+++ b/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
index 9835669..9835669 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/tmmintrin.h
+++ b/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
index 4ff9017..4ff9017 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/unwind.h
+++ b/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
index 4b9803e..4b9803e 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/varargs.h
+++ b/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
index 2c4bdc9..2c4bdc9 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/wmmintrin.h
+++ b/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
index 36b43df..36b43df 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/x86intrin.h
+++ b/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
index 5aefa9d..5aefa9d 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/xmmintrin.h
+++ b/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
index 3ebcb4b..3ebcb4b 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include/xopintrin.h
+++ b/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
index b416761..3287f3f 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/libgcc.a
+++ b/lib/gcc/i686-linux-android/4.6/libgcc.a
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/libgcov.a b/lib/gcc/i686-linux-android/4.6/libgcov.a
index f019e1d..b9eab40 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/libgcov.a
+++ b/lib/gcc/i686-linux-android/4.6/libgcov.a
diff --git a/lib/libiberty.a b/lib/libiberty.a
index 0e47e7f..6054b8f 100644
--- a/lib/libiberty.a
+++ b/lib/libiberty.a
diff --git a/lib32/libbfd.a b/lib32/libbfd.a
index 7cec250..df9c549 100644
--- a/lib32/libbfd.a
+++ b/lib32/libbfd.a
diff --git a/lib32/libintl.a b/lib32/libintl.a
index 1e79ee1..db58033 100644
--- a/lib32/libintl.a
+++ b/lib32/libintl.a
diff --git a/libexec/gcc/i686-linux-android/4.6.x-google/cc1 b/libexec/gcc/i686-linux-android/4.6/cc1
index e7dfc8c..8423175 100755
--- a/libexec/gcc/i686-linux-android/4.6.x-google/cc1
+++ b/libexec/gcc/i686-linux-android/4.6/cc1
diff --git a/libexec/gcc/i686-linux-android/4.6.x-google/cc1plus b/libexec/gcc/i686-linux-android/4.6/cc1plus
index c1f03a1..97dc056 100755
--- a/libexec/gcc/i686-linux-android/4.6.x-google/cc1plus
+++ b/libexec/gcc/i686-linux-android/4.6/cc1plus
diff --git a/libexec/gcc/i686-linux-android/4.6.x-google/collect2 b/libexec/gcc/i686-linux-android/4.6/collect2
index 5c70014..b851e08 100755
--- a/libexec/gcc/i686-linux-android/4.6.x-google/collect2
+++ b/libexec/gcc/i686-linux-android/4.6/collect2
diff --git a/libexec/gcc/i686-linux-android/4.6.x-google/libfunction_reordering_plugin.0.so b/libexec/gcc/i686-linux-android/4.6/libfunction_reordering_plugin.0.so
index af33175..af33175 100755
--- a/libexec/gcc/i686-linux-android/4.6.x-google/libfunction_reordering_plugin.0.so
+++ b/libexec/gcc/i686-linux-android/4.6/libfunction_reordering_plugin.0.so
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
index 7b075e6..05cf92d 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 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/tmp/ndk-User/build/toolchain/prefix/libexec/gcc/i686-linux-android/4.6.x-google'
+libdir='/tmp/ndk-User/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
index 14c0289..14c0289 120000
--- 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
diff --git a/libexec/gcc/i686-linux-android/4.6.x-google/liblto_plugin.0.so b/libexec/gcc/i686-linux-android/4.6/liblto_plugin.0.so
index 96212a7..96212a7 100755
--- a/libexec/gcc/i686-linux-android/4.6.x-google/liblto_plugin.0.so
+++ b/libexec/gcc/i686-linux-android/4.6/liblto_plugin.0.so
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
index 86de6b6..a0fd587 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 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/tmp/ndk-User/build/toolchain/prefix/libexec/gcc/i686-linux-android/4.6.x-google'
+libdir='/tmp/ndk-User/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
index 3c0440e..3c0440e 120000
--- a/libexec/gcc/i686-linux-android/4.6.x-google/liblto_plugin.so
+++ b/libexec/gcc/i686-linux-android/4.6/liblto_plugin.so
diff --git a/libexec/gcc/i686-linux-android/4.6.x-google/lto-wrapper b/libexec/gcc/i686-linux-android/4.6/lto-wrapper
index b7b6396..b7b6396 100755
--- a/libexec/gcc/i686-linux-android/4.6.x-google/lto-wrapper
+++ b/libexec/gcc/i686-linux-android/4.6/lto-wrapper
diff --git a/libexec/gcc/i686-linux-android/4.6.x-google/lto1 b/libexec/gcc/i686-linux-android/4.6/lto1
index b4a9476..c0e4799 100755
--- a/libexec/gcc/i686-linux-android/4.6.x-google/lto1
+++ b/libexec/gcc/i686-linux-android/4.6/lto1