diff --git a/SOURCES b/SOURCES
index 5bfae6b..7ff53d9 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           0bacab67d884144f0f0701359c481a6f0749f1f3 Provide __executable_start for PIE
+toolchain/gcc.git                5d8cb1af30dc348b89a0dfc4a00ef6ab0b466d66 Fix MIPS GCC __builtin_unreachable issue compiling LLVM
+toolchain/gdb.git                ccddbccc8f41940aa30324b4aa2d8933159575b7 Fix gdb 7.3.x build on Windows
diff --git a/bin/mipsel-linux-android-addr2line b/bin/mipsel-linux-android-addr2line
index 7fd6da8..6266534 100755
--- a/bin/mipsel-linux-android-addr2line
+++ b/bin/mipsel-linux-android-addr2line
Binary files differ
diff --git a/bin/mipsel-linux-android-ar b/bin/mipsel-linux-android-ar
index aca4d61..405d7cd 100755
--- a/bin/mipsel-linux-android-ar
+++ b/bin/mipsel-linux-android-ar
Binary files differ
diff --git a/bin/mipsel-linux-android-as b/bin/mipsel-linux-android-as
index febdd4f..6320049 100755
--- a/bin/mipsel-linux-android-as
+++ b/bin/mipsel-linux-android-as
Binary files differ
diff --git a/bin/mipsel-linux-android-c++ b/bin/mipsel-linux-android-c++
index 92a1ccc..ffaa194 100755
--- a/bin/mipsel-linux-android-c++
+++ b/bin/mipsel-linux-android-c++
Binary files differ
diff --git a/bin/mipsel-linux-android-c++filt b/bin/mipsel-linux-android-c++filt
index ab7a8ad..1e0d64d 100755
--- a/bin/mipsel-linux-android-c++filt
+++ b/bin/mipsel-linux-android-c++filt
Binary files differ
diff --git a/bin/mipsel-linux-android-cpp b/bin/mipsel-linux-android-cpp
index df54842..e36dbec 100755
--- a/bin/mipsel-linux-android-cpp
+++ b/bin/mipsel-linux-android-cpp
Binary files differ
diff --git a/bin/mipsel-linux-android-g++ b/bin/mipsel-linux-android-g++
index 92a1ccc..ffaa194 100755
--- a/bin/mipsel-linux-android-g++
+++ b/bin/mipsel-linux-android-g++
Binary files differ
diff --git a/bin/mipsel-linux-android-gcc b/bin/mipsel-linux-android-gcc
index 78cc6f7..2365738 100755
--- a/bin/mipsel-linux-android-gcc
+++ b/bin/mipsel-linux-android-gcc
Binary files differ
diff --git a/bin/mipsel-linux-android-gcc-4.6 b/bin/mipsel-linux-android-gcc-4.6
new file mode 100755
index 0000000..2365738
--- /dev/null
+++ b/bin/mipsel-linux-android-gcc-4.6
Binary files differ
diff --git a/bin/mipsel-linux-android-gcc-4.6.x-google b/bin/mipsel-linux-android-gcc-4.6.x-google
deleted file mode 100755
index 78cc6f7..0000000
--- a/bin/mipsel-linux-android-gcc-4.6.x-google
+++ /dev/null
Binary files differ
diff --git a/bin/mipsel-linux-android-gcov b/bin/mipsel-linux-android-gcov
index 6f59db7..53157fe 100755
--- a/bin/mipsel-linux-android-gcov
+++ b/bin/mipsel-linux-android-gcov
Binary files differ
diff --git a/bin/mipsel-linux-android-gdb b/bin/mipsel-linux-android-gdb
index 3b876f2..5fc6f12 100755
--- a/bin/mipsel-linux-android-gdb
+++ b/bin/mipsel-linux-android-gdb
Binary files differ
diff --git a/bin/mipsel-linux-android-gdbtui b/bin/mipsel-linux-android-gdbtui
index 49bfa47..5610294 100755
--- a/bin/mipsel-linux-android-gdbtui
+++ b/bin/mipsel-linux-android-gdbtui
Binary files differ
diff --git a/bin/mipsel-linux-android-gprof b/bin/mipsel-linux-android-gprof
index c639f04..75a2e99 100755
--- a/bin/mipsel-linux-android-gprof
+++ b/bin/mipsel-linux-android-gprof
Binary files differ
diff --git a/bin/mipsel-linux-android-ld b/bin/mipsel-linux-android-ld
index 9603dee..d46c368 100755
--- a/bin/mipsel-linux-android-ld
+++ b/bin/mipsel-linux-android-ld
Binary files differ
diff --git a/bin/mipsel-linux-android-ld.bfd b/bin/mipsel-linux-android-ld.bfd
index 9603dee..d46c368 100755
--- a/bin/mipsel-linux-android-ld.bfd
+++ b/bin/mipsel-linux-android-ld.bfd
Binary files differ
diff --git a/bin/mipsel-linux-android-nm b/bin/mipsel-linux-android-nm
index 935fa26..a575621 100755
--- a/bin/mipsel-linux-android-nm
+++ b/bin/mipsel-linux-android-nm
Binary files differ
diff --git a/bin/mipsel-linux-android-objcopy b/bin/mipsel-linux-android-objcopy
index 2081479..c08d8be 100755
--- a/bin/mipsel-linux-android-objcopy
+++ b/bin/mipsel-linux-android-objcopy
Binary files differ
diff --git a/bin/mipsel-linux-android-objdump b/bin/mipsel-linux-android-objdump
index ed33ce2..a1b1803 100755
--- a/bin/mipsel-linux-android-objdump
+++ b/bin/mipsel-linux-android-objdump
Binary files differ
diff --git a/bin/mipsel-linux-android-ranlib b/bin/mipsel-linux-android-ranlib
index d368c84..cea5ac8 100755
--- a/bin/mipsel-linux-android-ranlib
+++ b/bin/mipsel-linux-android-ranlib
Binary files differ
diff --git a/bin/mipsel-linux-android-run b/bin/mipsel-linux-android-run
index fe78980..e34c561 100755
--- a/bin/mipsel-linux-android-run
+++ b/bin/mipsel-linux-android-run
Binary files differ
diff --git a/bin/mipsel-linux-android-size b/bin/mipsel-linux-android-size
index 968426e..6824cef 100755
--- a/bin/mipsel-linux-android-size
+++ b/bin/mipsel-linux-android-size
Binary files differ
diff --git a/bin/mipsel-linux-android-strings b/bin/mipsel-linux-android-strings
index 1c172a3..9aedf2a 100755
--- a/bin/mipsel-linux-android-strings
+++ b/bin/mipsel-linux-android-strings
Binary files differ
diff --git a/bin/mipsel-linux-android-strip b/bin/mipsel-linux-android-strip
index 69ebb5a..0438ab6 100755
--- a/bin/mipsel-linux-android-strip
+++ b/bin/mipsel-linux-android-strip
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/crtbegin.o b/lib/gcc/mipsel-linux-android/4.6.x-google/crtbegin.o
deleted file mode 100644
index 7ab194a..0000000
--- a/lib/gcc/mipsel-linux-android/4.6.x-google/crtbegin.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/crtbeginS.o b/lib/gcc/mipsel-linux-android/4.6.x-google/crtbeginS.o
deleted file mode 100644
index 1ef1f12..0000000
--- a/lib/gcc/mipsel-linux-android/4.6.x-google/crtbeginS.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/crtbeginT.o b/lib/gcc/mipsel-linux-android/4.6.x-google/crtbeginT.o
deleted file mode 100644
index 7ab194a..0000000
--- a/lib/gcc/mipsel-linux-android/4.6.x-google/crtbeginT.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/crtend.o b/lib/gcc/mipsel-linux-android/4.6.x-google/crtend.o
deleted file mode 100644
index 7507903..0000000
--- a/lib/gcc/mipsel-linux-android/4.6.x-google/crtend.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/crtendS.o b/lib/gcc/mipsel-linux-android/4.6.x-google/crtendS.o
deleted file mode 100644
index 7507903..0000000
--- a/lib/gcc/mipsel-linux-android/4.6.x-google/crtendS.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/crtfastmath.o b/lib/gcc/mipsel-linux-android/4.6.x-google/crtfastmath.o
deleted file mode 100644
index 225ad85..0000000
--- a/lib/gcc/mipsel-linux-android/4.6.x-google/crtfastmath.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/libgcc.a b/lib/gcc/mipsel-linux-android/4.6.x-google/libgcc.a
deleted file mode 100644
index b1fc78f..0000000
--- a/lib/gcc/mipsel-linux-android/4.6.x-google/libgcc.a
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/libgcov.a b/lib/gcc/mipsel-linux-android/4.6.x-google/libgcov.a
deleted file mode 100644
index 09bbf1c..0000000
--- a/lib/gcc/mipsel-linux-android/4.6.x-google/libgcov.a
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/mips-r2/crtbegin.o b/lib/gcc/mipsel-linux-android/4.6.x-google/mips-r2/crtbegin.o
deleted file mode 100644
index 1e47c5e..0000000
--- a/lib/gcc/mipsel-linux-android/4.6.x-google/mips-r2/crtbegin.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/mips-r2/crtbeginS.o b/lib/gcc/mipsel-linux-android/4.6.x-google/mips-r2/crtbeginS.o
deleted file mode 100644
index e4a0c92..0000000
--- a/lib/gcc/mipsel-linux-android/4.6.x-google/mips-r2/crtbeginS.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/mips-r2/crtbeginT.o b/lib/gcc/mipsel-linux-android/4.6.x-google/mips-r2/crtbeginT.o
deleted file mode 100644
index 1e47c5e..0000000
--- a/lib/gcc/mipsel-linux-android/4.6.x-google/mips-r2/crtbeginT.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/mips-r2/crtend.o b/lib/gcc/mipsel-linux-android/4.6.x-google/mips-r2/crtend.o
deleted file mode 100644
index db38586..0000000
--- a/lib/gcc/mipsel-linux-android/4.6.x-google/mips-r2/crtend.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/mips-r2/crtendS.o b/lib/gcc/mipsel-linux-android/4.6.x-google/mips-r2/crtendS.o
deleted file mode 100644
index db38586..0000000
--- a/lib/gcc/mipsel-linux-android/4.6.x-google/mips-r2/crtendS.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/mips-r2/crtfastmath.o b/lib/gcc/mipsel-linux-android/4.6.x-google/mips-r2/crtfastmath.o
deleted file mode 100644
index 1c3639a..0000000
--- a/lib/gcc/mipsel-linux-android/4.6.x-google/mips-r2/crtfastmath.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/mips-r2/libgcc.a b/lib/gcc/mipsel-linux-android/4.6.x-google/mips-r2/libgcc.a
deleted file mode 100644
index fd69b54..0000000
--- a/lib/gcc/mipsel-linux-android/4.6.x-google/mips-r2/libgcc.a
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/mips-r2/libgcov.a b/lib/gcc/mipsel-linux-android/4.6.x-google/mips-r2/libgcov.a
deleted file mode 100644
index 5ec7f5c..0000000
--- a/lib/gcc/mipsel-linux-android/4.6.x-google/mips-r2/libgcov.a
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6/crtbegin.o b/lib/gcc/mipsel-linux-android/4.6/crtbegin.o
new file mode 100644
index 0000000..6614664
--- /dev/null
+++ b/lib/gcc/mipsel-linux-android/4.6/crtbegin.o
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6/crtbeginS.o b/lib/gcc/mipsel-linux-android/4.6/crtbeginS.o
new file mode 100644
index 0000000..346eb9c
--- /dev/null
+++ b/lib/gcc/mipsel-linux-android/4.6/crtbeginS.o
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6/crtbeginT.o b/lib/gcc/mipsel-linux-android/4.6/crtbeginT.o
new file mode 100644
index 0000000..6614664
--- /dev/null
+++ b/lib/gcc/mipsel-linux-android/4.6/crtbeginT.o
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6/crtend.o b/lib/gcc/mipsel-linux-android/4.6/crtend.o
new file mode 100644
index 0000000..ea83a15
--- /dev/null
+++ b/lib/gcc/mipsel-linux-android/4.6/crtend.o
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6/crtendS.o b/lib/gcc/mipsel-linux-android/4.6/crtendS.o
new file mode 100644
index 0000000..ea83a15
--- /dev/null
+++ b/lib/gcc/mipsel-linux-android/4.6/crtendS.o
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6/crtfastmath.o b/lib/gcc/mipsel-linux-android/4.6/crtfastmath.o
new file mode 100644
index 0000000..cc1a7a5
--- /dev/null
+++ b/lib/gcc/mipsel-linux-android/4.6/crtfastmath.o
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/gcov-src/gcov-io.c b/lib/gcc/mipsel-linux-android/4.6/gcov-src/gcov-io.c
similarity index 100%
rename from lib/gcc/mipsel-linux-android/4.6.x-google/gcov-src/gcov-io.c
rename to lib/gcc/mipsel-linux-android/4.6/gcov-src/gcov-io.c
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/gcov-src/gcov-io.h b/lib/gcc/mipsel-linux-android/4.6/gcov-src/gcov-io.h
similarity index 100%
rename from lib/gcc/mipsel-linux-android/4.6.x-google/gcov-src/gcov-io.h
rename to lib/gcc/mipsel-linux-android/4.6/gcov-src/gcov-io.h
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/gcov-src/gcov-iov.h b/lib/gcc/mipsel-linux-android/4.6/gcov-src/gcov-iov.h
similarity index 69%
rename from lib/gcc/mipsel-linux-android/4.6.x-google/gcov-src/gcov-iov.h
rename to lib/gcc/mipsel-linux-android/4.6/gcov-src/gcov-iov.h
index 5a641bc..3c8c9ef 100644
--- a/lib/gcc/mipsel-linux-android/4.6.x-google/gcov-src/gcov-iov.h
+++ b/lib/gcc/mipsel-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/mipsel-linux-android/4.6.x-google/gcov-src/libgcov.c b/lib/gcc/mipsel-linux-android/4.6/gcov-src/libgcov.c
similarity index 100%
rename from lib/gcc/mipsel-linux-android/4.6.x-google/gcov-src/libgcov.c
rename to lib/gcc/mipsel-linux-android/4.6/gcov-src/libgcov.c
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/include-fixed/README b/lib/gcc/mipsel-linux-android/4.6/include-fixed/README
similarity index 100%
rename from lib/gcc/mipsel-linux-android/4.6.x-google/include-fixed/README
rename to lib/gcc/mipsel-linux-android/4.6/include-fixed/README
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/include-fixed/limits.h b/lib/gcc/mipsel-linux-android/4.6/include-fixed/limits.h
similarity index 100%
rename from lib/gcc/mipsel-linux-android/4.6.x-google/include-fixed/limits.h
rename to lib/gcc/mipsel-linux-android/4.6/include-fixed/limits.h
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/include-fixed/linux/a.out.h b/lib/gcc/mipsel-linux-android/4.6/include-fixed/linux/a.out.h
similarity index 97%
rename from lib/gcc/mipsel-linux-android/4.6.x-google/include-fixed/linux/a.out.h
rename to lib/gcc/mipsel-linux-android/4.6/include-fixed/linux/a.out.h
index 8bf3daf..0b5059a 100644
--- a/lib/gcc/mipsel-linux-android/4.6.x-google/include-fixed/linux/a.out.h
+++ b/lib/gcc/mipsel-linux-android/4.6/include-fixed/linux/a.out.h
@@ -2,7 +2,7 @@
 
     It has been auto-edited by fixincludes from:
 
-	"/home/andrewhsieh/internaldroid/ndk/toolchains/mipsel-linux-android-4.6/prebuilt/linux-x86/sysroot/usr/include/linux/a.out.h"
+	"/tmp/ndk-andrewhsieh/build/toolchain/prefix/sysroot/usr/include/linux/a.out.h"
 
     This had to be done to correct non-standard usages in the
     original, manufacturer supplied header file.  */
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/include-fixed/stdio.h b/lib/gcc/mipsel-linux-android/4.6/include-fixed/stdio.h
similarity index 98%
rename from lib/gcc/mipsel-linux-android/4.6.x-google/include-fixed/stdio.h
rename to lib/gcc/mipsel-linux-android/4.6/include-fixed/stdio.h
index 2b8311a..f436c47 100644
--- a/lib/gcc/mipsel-linux-android/4.6.x-google/include-fixed/stdio.h
+++ b/lib/gcc/mipsel-linux-android/4.6/include-fixed/stdio.h
@@ -2,7 +2,7 @@
 
     It has been auto-edited by fixincludes from:
 
-	"/home/andrewhsieh/internaldroid/ndk/toolchains/mipsel-linux-android-4.6/prebuilt/linux-x86/sysroot/usr/include/stdio.h"
+	"/tmp/ndk-andrewhsieh/build/toolchain/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/mipsel-linux-android/4.6.x-google/include-fixed/sys/types.h b/lib/gcc/mipsel-linux-android/4.6/include-fixed/sys/types.h
similarity index 96%
rename from lib/gcc/mipsel-linux-android/4.6.x-google/include-fixed/sys/types.h
rename to lib/gcc/mipsel-linux-android/4.6/include-fixed/sys/types.h
index 21467cf..be4d572 100644
--- a/lib/gcc/mipsel-linux-android/4.6.x-google/include-fixed/sys/types.h
+++ b/lib/gcc/mipsel-linux-android/4.6/include-fixed/sys/types.h
@@ -2,7 +2,7 @@
 
     It has been auto-edited by fixincludes from:
 
-	"/home/andrewhsieh/internaldroid/ndk/toolchains/mipsel-linux-android-4.6/prebuilt/linux-x86/sysroot/usr/include/sys/types.h"
+	"/tmp/ndk-andrewhsieh/build/toolchain/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/mipsel-linux-android/4.6.x-google/include-fixed/syslimits.h b/lib/gcc/mipsel-linux-android/4.6/include-fixed/syslimits.h
similarity index 100%
rename from lib/gcc/mipsel-linux-android/4.6.x-google/include-fixed/syslimits.h
rename to lib/gcc/mipsel-linux-android/4.6/include-fixed/syslimits.h
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/include/float.h b/lib/gcc/mipsel-linux-android/4.6/include/float.h
similarity index 100%
rename from lib/gcc/mipsel-linux-android/4.6.x-google/include/float.h
rename to lib/gcc/mipsel-linux-android/4.6/include/float.h
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/include/iso646.h b/lib/gcc/mipsel-linux-android/4.6/include/iso646.h
similarity index 100%
rename from lib/gcc/mipsel-linux-android/4.6.x-google/include/iso646.h
rename to lib/gcc/mipsel-linux-android/4.6/include/iso646.h
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/include/loongson.h b/lib/gcc/mipsel-linux-android/4.6/include/loongson.h
similarity index 100%
rename from lib/gcc/mipsel-linux-android/4.6.x-google/include/loongson.h
rename to lib/gcc/mipsel-linux-android/4.6/include/loongson.h
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/include/stdarg.h b/lib/gcc/mipsel-linux-android/4.6/include/stdarg.h
similarity index 100%
rename from lib/gcc/mipsel-linux-android/4.6.x-google/include/stdarg.h
rename to lib/gcc/mipsel-linux-android/4.6/include/stdarg.h
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/include/stdbool.h b/lib/gcc/mipsel-linux-android/4.6/include/stdbool.h
similarity index 100%
rename from lib/gcc/mipsel-linux-android/4.6.x-google/include/stdbool.h
rename to lib/gcc/mipsel-linux-android/4.6/include/stdbool.h
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/include/stddef.h b/lib/gcc/mipsel-linux-android/4.6/include/stddef.h
similarity index 100%
rename from lib/gcc/mipsel-linux-android/4.6.x-google/include/stddef.h
rename to lib/gcc/mipsel-linux-android/4.6/include/stddef.h
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/include/stdfix.h b/lib/gcc/mipsel-linux-android/4.6/include/stdfix.h
similarity index 100%
rename from lib/gcc/mipsel-linux-android/4.6.x-google/include/stdfix.h
rename to lib/gcc/mipsel-linux-android/4.6/include/stdfix.h
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/include/stdint-gcc.h b/lib/gcc/mipsel-linux-android/4.6/include/stdint-gcc.h
similarity index 100%
rename from lib/gcc/mipsel-linux-android/4.6.x-google/include/stdint-gcc.h
rename to lib/gcc/mipsel-linux-android/4.6/include/stdint-gcc.h
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/include/stdint.h b/lib/gcc/mipsel-linux-android/4.6/include/stdint.h
similarity index 100%
rename from lib/gcc/mipsel-linux-android/4.6.x-google/include/stdint.h
rename to lib/gcc/mipsel-linux-android/4.6/include/stdint.h
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/include/unwind.h b/lib/gcc/mipsel-linux-android/4.6/include/unwind.h
similarity index 100%
rename from lib/gcc/mipsel-linux-android/4.6.x-google/include/unwind.h
rename to lib/gcc/mipsel-linux-android/4.6/include/unwind.h
diff --git a/lib/gcc/mipsel-linux-android/4.6.x-google/include/varargs.h b/lib/gcc/mipsel-linux-android/4.6/include/varargs.h
similarity index 100%
rename from lib/gcc/mipsel-linux-android/4.6.x-google/include/varargs.h
rename to lib/gcc/mipsel-linux-android/4.6/include/varargs.h
diff --git a/lib/gcc/mipsel-linux-android/4.6/libgcc.a b/lib/gcc/mipsel-linux-android/4.6/libgcc.a
new file mode 100644
index 0000000..978121a
--- /dev/null
+++ b/lib/gcc/mipsel-linux-android/4.6/libgcc.a
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6/libgcov.a b/lib/gcc/mipsel-linux-android/4.6/libgcov.a
new file mode 100644
index 0000000..8bcd369
--- /dev/null
+++ b/lib/gcc/mipsel-linux-android/4.6/libgcov.a
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6/mips-r2/crtbegin.o b/lib/gcc/mipsel-linux-android/4.6/mips-r2/crtbegin.o
new file mode 100644
index 0000000..d71a311
--- /dev/null
+++ b/lib/gcc/mipsel-linux-android/4.6/mips-r2/crtbegin.o
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6/mips-r2/crtbeginS.o b/lib/gcc/mipsel-linux-android/4.6/mips-r2/crtbeginS.o
new file mode 100644
index 0000000..2c94e68
--- /dev/null
+++ b/lib/gcc/mipsel-linux-android/4.6/mips-r2/crtbeginS.o
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6/mips-r2/crtbeginT.o b/lib/gcc/mipsel-linux-android/4.6/mips-r2/crtbeginT.o
new file mode 100644
index 0000000..d71a311
--- /dev/null
+++ b/lib/gcc/mipsel-linux-android/4.6/mips-r2/crtbeginT.o
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6/mips-r2/crtend.o b/lib/gcc/mipsel-linux-android/4.6/mips-r2/crtend.o
new file mode 100644
index 0000000..c1de15e
--- /dev/null
+++ b/lib/gcc/mipsel-linux-android/4.6/mips-r2/crtend.o
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6/mips-r2/crtendS.o b/lib/gcc/mipsel-linux-android/4.6/mips-r2/crtendS.o
new file mode 100644
index 0000000..c1de15e
--- /dev/null
+++ b/lib/gcc/mipsel-linux-android/4.6/mips-r2/crtendS.o
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6/mips-r2/crtfastmath.o b/lib/gcc/mipsel-linux-android/4.6/mips-r2/crtfastmath.o
new file mode 100644
index 0000000..0c78818
--- /dev/null
+++ b/lib/gcc/mipsel-linux-android/4.6/mips-r2/crtfastmath.o
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6/mips-r2/libgcc.a b/lib/gcc/mipsel-linux-android/4.6/mips-r2/libgcc.a
new file mode 100644
index 0000000..c6d9d0d
--- /dev/null
+++ b/lib/gcc/mipsel-linux-android/4.6/mips-r2/libgcc.a
Binary files differ
diff --git a/lib/gcc/mipsel-linux-android/4.6/mips-r2/libgcov.a b/lib/gcc/mipsel-linux-android/4.6/mips-r2/libgcov.a
new file mode 100644
index 0000000..71217cc
--- /dev/null
+++ b/lib/gcc/mipsel-linux-android/4.6/mips-r2/libgcov.a
Binary files differ
diff --git a/lib/libiberty.a b/lib/libiberty.a
index 79d783d..8e360ae 100644
--- a/lib/libiberty.a
+++ b/lib/libiberty.a
Binary files differ
diff --git a/lib/libmipsel-unknown-linux-android-sim.a b/lib/libmipsel-unknown-linux-android-sim.a
index adfdcc4..8e569d7 100644
--- a/lib/libmipsel-unknown-linux-android-sim.a
+++ b/lib/libmipsel-unknown-linux-android-sim.a
Binary files differ
diff --git a/lib32/libbfd.a b/lib32/libbfd.a
index 68d9a6c..7011fd9 100644
--- a/lib32/libbfd.a
+++ b/lib32/libbfd.a
Binary files differ
diff --git a/lib32/libbfd.la b/lib32/libbfd.la
index ec8ee45..4de2ee8 100755
--- a/lib32/libbfd.la
+++ b/lib32/libbfd.la
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/andrewhsieh/internaldroid/ndk/toolchains/mipsel-linux-android-4.6/prebuilt/linux-x86/x86_64-pc-linux-gnu/mipsel-linux-android/lib'
+libdir='/tmp/ndk-andrewhsieh/build/toolchain/prefix/x86_64-pc-linux-gnu/mipsel-linux-android/lib'
diff --git a/lib32/libintl.a b/lib32/libintl.a
index 4f5e395..a83ac2b 100644
--- a/lib32/libintl.a
+++ b/lib32/libintl.a
Binary files differ
diff --git a/libexec/gcc/mipsel-linux-android/4.6.x-google/cc1plus b/libexec/gcc/mipsel-linux-android/4.6.x-google/cc1plus
deleted file mode 100755
index ab1b763..0000000
--- a/libexec/gcc/mipsel-linux-android/4.6.x-google/cc1plus
+++ /dev/null
Binary files differ
diff --git a/libexec/gcc/mipsel-linux-android/4.6.x-google/collect2 b/libexec/gcc/mipsel-linux-android/4.6.x-google/collect2
deleted file mode 100755
index 23b4f4a..0000000
--- a/libexec/gcc/mipsel-linux-android/4.6.x-google/collect2
+++ /dev/null
Binary files differ
diff --git a/libexec/gcc/mipsel-linux-android/4.6.x-google/lto1 b/libexec/gcc/mipsel-linux-android/4.6.x-google/lto1
deleted file mode 100755
index 04acbd2..0000000
--- a/libexec/gcc/mipsel-linux-android/4.6.x-google/lto1
+++ /dev/null
Binary files differ
diff --git a/libexec/gcc/mipsel-linux-android/4.6.x-google/cc1 b/libexec/gcc/mipsel-linux-android/4.6/cc1
similarity index 72%
rename from libexec/gcc/mipsel-linux-android/4.6.x-google/cc1
rename to libexec/gcc/mipsel-linux-android/4.6/cc1
index 842c206..7642703 100755
--- a/libexec/gcc/mipsel-linux-android/4.6.x-google/cc1
+++ b/libexec/gcc/mipsel-linux-android/4.6/cc1
Binary files differ
diff --git a/libexec/gcc/mipsel-linux-android/4.6/cc1plus b/libexec/gcc/mipsel-linux-android/4.6/cc1plus
new file mode 100755
index 0000000..e67573d
--- /dev/null
+++ b/libexec/gcc/mipsel-linux-android/4.6/cc1plus
Binary files differ
diff --git a/libexec/gcc/mipsel-linux-android/4.6/collect2 b/libexec/gcc/mipsel-linux-android/4.6/collect2
new file mode 100755
index 0000000..a597aab
--- /dev/null
+++ b/libexec/gcc/mipsel-linux-android/4.6/collect2
Binary files differ
diff --git a/libexec/gcc/mipsel-linux-android/4.6.x-google/libfunction_reordering_plugin.la b/libexec/gcc/mipsel-linux-android/4.6/libfunction_reordering_plugin.la
similarity index 87%
rename from libexec/gcc/mipsel-linux-android/4.6.x-google/libfunction_reordering_plugin.la
rename to libexec/gcc/mipsel-linux-android/4.6/libfunction_reordering_plugin.la
index c21a7d8..9445de5 100755
--- a/libexec/gcc/mipsel-linux-android/4.6.x-google/libfunction_reordering_plugin.la
+++ b/libexec/gcc/mipsel-linux-android/4.6/libfunction_reordering_plugin.la
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/andrewhsieh/internaldroid/ndk/toolchains/mipsel-linux-android-4.6/prebuilt/linux-x86/libexec/gcc/mipsel-linux-android/4.6.x-google'
+libdir='/tmp/ndk-andrewhsieh/build/toolchain/prefix/libexec/gcc/mipsel-linux-android/4.6'
diff --git a/libexec/gcc/mipsel-linux-android/4.6.x-google/libfunction_reordering_plugin.so b/libexec/gcc/mipsel-linux-android/4.6/libfunction_reordering_plugin.so
similarity index 100%
rename from libexec/gcc/mipsel-linux-android/4.6.x-google/libfunction_reordering_plugin.so
rename to libexec/gcc/mipsel-linux-android/4.6/libfunction_reordering_plugin.so
diff --git a/libexec/gcc/mipsel-linux-android/4.6.x-google/libfunction_reordering_plugin.so.0 b/libexec/gcc/mipsel-linux-android/4.6/libfunction_reordering_plugin.so.0
similarity index 100%
rename from libexec/gcc/mipsel-linux-android/4.6.x-google/libfunction_reordering_plugin.so.0
rename to libexec/gcc/mipsel-linux-android/4.6/libfunction_reordering_plugin.so.0
diff --git a/libexec/gcc/mipsel-linux-android/4.6.x-google/libfunction_reordering_plugin.so.0.0.0 b/libexec/gcc/mipsel-linux-android/4.6/libfunction_reordering_plugin.so.0.0.0
similarity index 100%
rename from libexec/gcc/mipsel-linux-android/4.6.x-google/libfunction_reordering_plugin.so.0.0.0
rename to libexec/gcc/mipsel-linux-android/4.6/libfunction_reordering_plugin.so.0.0.0
Binary files differ
diff --git a/libexec/gcc/mipsel-linux-android/4.6.x-google/liblto_plugin.la b/libexec/gcc/mipsel-linux-android/4.6/liblto_plugin.la
similarity index 86%
rename from libexec/gcc/mipsel-linux-android/4.6.x-google/liblto_plugin.la
rename to libexec/gcc/mipsel-linux-android/4.6/liblto_plugin.la
index b8f8b0d..05d3001 100755
--- a/libexec/gcc/mipsel-linux-android/4.6.x-google/liblto_plugin.la
+++ b/libexec/gcc/mipsel-linux-android/4.6/liblto_plugin.la
@@ -38,4 +38,4 @@
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/andrewhsieh/internaldroid/ndk/toolchains/mipsel-linux-android-4.6/prebuilt/linux-x86/libexec/gcc/mipsel-linux-android/4.6.x-google'
+libdir='/tmp/ndk-andrewhsieh/build/toolchain/prefix/libexec/gcc/mipsel-linux-android/4.6'
diff --git a/libexec/gcc/mipsel-linux-android/4.6.x-google/liblto_plugin.so b/libexec/gcc/mipsel-linux-android/4.6/liblto_plugin.so
similarity index 100%
rename from libexec/gcc/mipsel-linux-android/4.6.x-google/liblto_plugin.so
rename to libexec/gcc/mipsel-linux-android/4.6/liblto_plugin.so
diff --git a/libexec/gcc/mipsel-linux-android/4.6.x-google/liblto_plugin.so.0 b/libexec/gcc/mipsel-linux-android/4.6/liblto_plugin.so.0
similarity index 100%
rename from libexec/gcc/mipsel-linux-android/4.6.x-google/liblto_plugin.so.0
rename to libexec/gcc/mipsel-linux-android/4.6/liblto_plugin.so.0
diff --git a/libexec/gcc/mipsel-linux-android/4.6.x-google/liblto_plugin.so.0.0.0 b/libexec/gcc/mipsel-linux-android/4.6/liblto_plugin.so.0.0.0
similarity index 100%
rename from libexec/gcc/mipsel-linux-android/4.6.x-google/liblto_plugin.so.0.0.0
rename to libexec/gcc/mipsel-linux-android/4.6/liblto_plugin.so.0.0.0
Binary files differ
diff --git a/libexec/gcc/mipsel-linux-android/4.6.x-google/lto-wrapper b/libexec/gcc/mipsel-linux-android/4.6/lto-wrapper
similarity index 100%
rename from libexec/gcc/mipsel-linux-android/4.6.x-google/lto-wrapper
rename to libexec/gcc/mipsel-linux-android/4.6/lto-wrapper
Binary files differ
diff --git a/libexec/gcc/mipsel-linux-android/4.6/lto1 b/libexec/gcc/mipsel-linux-android/4.6/lto1
new file mode 100755
index 0000000..8f8205b
--- /dev/null
+++ b/libexec/gcc/mipsel-linux-android/4.6/lto1
Binary files differ
diff --git a/mipsel-linux-android/bin/ar b/mipsel-linux-android/bin/ar
index aca4d61..405d7cd 100755
--- a/mipsel-linux-android/bin/ar
+++ b/mipsel-linux-android/bin/ar
Binary files differ
diff --git a/mipsel-linux-android/bin/as b/mipsel-linux-android/bin/as
index febdd4f..6320049 100755
--- a/mipsel-linux-android/bin/as
+++ b/mipsel-linux-android/bin/as
Binary files differ
diff --git a/mipsel-linux-android/bin/c++ b/mipsel-linux-android/bin/c++
index 92a1ccc..ffaa194 100755
--- a/mipsel-linux-android/bin/c++
+++ b/mipsel-linux-android/bin/c++
Binary files differ
diff --git a/mipsel-linux-android/bin/g++ b/mipsel-linux-android/bin/g++
index 92a1ccc..ffaa194 100755
--- a/mipsel-linux-android/bin/g++
+++ b/mipsel-linux-android/bin/g++
Binary files differ
diff --git a/mipsel-linux-android/bin/gcc b/mipsel-linux-android/bin/gcc
index 78cc6f7..2365738 100755
--- a/mipsel-linux-android/bin/gcc
+++ b/mipsel-linux-android/bin/gcc
Binary files differ
diff --git a/mipsel-linux-android/bin/ld b/mipsel-linux-android/bin/ld
index 9603dee..d46c368 100755
--- a/mipsel-linux-android/bin/ld
+++ b/mipsel-linux-android/bin/ld
Binary files differ
diff --git a/mipsel-linux-android/bin/ld.bfd b/mipsel-linux-android/bin/ld.bfd
index 9603dee..d46c368 100755
--- a/mipsel-linux-android/bin/ld.bfd
+++ b/mipsel-linux-android/bin/ld.bfd
Binary files differ
diff --git a/mipsel-linux-android/bin/nm b/mipsel-linux-android/bin/nm
index 935fa26..a575621 100755
--- a/mipsel-linux-android/bin/nm
+++ b/mipsel-linux-android/bin/nm
Binary files differ
diff --git a/mipsel-linux-android/bin/objcopy b/mipsel-linux-android/bin/objcopy
index 2081479..c08d8be 100755
--- a/mipsel-linux-android/bin/objcopy
+++ b/mipsel-linux-android/bin/objcopy
Binary files differ
diff --git a/mipsel-linux-android/bin/objdump b/mipsel-linux-android/bin/objdump
index ed33ce2..a1b1803 100755
--- a/mipsel-linux-android/bin/objdump
+++ b/mipsel-linux-android/bin/objdump
Binary files differ
diff --git a/mipsel-linux-android/bin/ranlib b/mipsel-linux-android/bin/ranlib
index d368c84..cea5ac8 100755
--- a/mipsel-linux-android/bin/ranlib
+++ b/mipsel-linux-android/bin/ranlib
Binary files differ
diff --git a/mipsel-linux-android/bin/strip b/mipsel-linux-android/bin/strip
index 69ebb5a..0438ab6 100755
--- a/mipsel-linux-android/bin/strip
+++ b/mipsel-linux-android/bin/strip
Binary files differ
diff --git a/mipsel-linux-android/lib/ldscripts/elf32btsmip.xd b/mipsel-linux-android/lib/ldscripts/elf32btsmip.xd
index ce2e599..5ce8b95 100644
--- a/mipsel-linux-android/lib/ldscripts/elf32btsmip.xd
+++ b/mipsel-linux-android/lib/ldscripts/elf32btsmip.xd
@@ -6,7 +6,7 @@
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  . = 0 + SIZEOF_HEADERS;
+  PROVIDE (__executable_start = 0); . = 0 + SIZEOF_HEADERS;
   .interp         : { *(.interp) }
   .reginfo        : { *(.reginfo) }
   .note.gnu.build-id : { *(.note.gnu.build-id) }
diff --git a/mipsel-linux-android/lib/ldscripts/elf32btsmip.xdc b/mipsel-linux-android/lib/ldscripts/elf32btsmip.xdc
index 4ce827f..5bbf912 100644
--- a/mipsel-linux-android/lib/ldscripts/elf32btsmip.xdc
+++ b/mipsel-linux-android/lib/ldscripts/elf32btsmip.xdc
@@ -6,7 +6,7 @@
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  . = 0 + SIZEOF_HEADERS;
+  PROVIDE (__executable_start = 0); . = 0 + SIZEOF_HEADERS;
   .interp         : { *(.interp) }
   .reginfo        : { *(.reginfo) }
   .note.gnu.build-id : { *(.note.gnu.build-id) }
diff --git a/mipsel-linux-android/lib/ldscripts/elf32btsmip.xdw b/mipsel-linux-android/lib/ldscripts/elf32btsmip.xdw
index 299cea5..d6b2c8b 100644
--- a/mipsel-linux-android/lib/ldscripts/elf32btsmip.xdw
+++ b/mipsel-linux-android/lib/ldscripts/elf32btsmip.xdw
@@ -6,7 +6,7 @@
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  . = 0 + SIZEOF_HEADERS;
+  PROVIDE (__executable_start = 0); . = 0 + SIZEOF_HEADERS;
   .interp         : { *(.interp) }
   .reginfo        : { *(.reginfo) }
   .note.gnu.build-id : { *(.note.gnu.build-id) }
diff --git a/mipsel-linux-android/lib/ldscripts/elf32btsmipn32.xd b/mipsel-linux-android/lib/ldscripts/elf32btsmipn32.xd
index 87d3bb2..f0d1e12 100644
--- a/mipsel-linux-android/lib/ldscripts/elf32btsmipn32.xd
+++ b/mipsel-linux-android/lib/ldscripts/elf32btsmipn32.xd
@@ -6,7 +6,7 @@
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  . = 0 + SIZEOF_HEADERS;
+  PROVIDE (__executable_start = 0); . = 0 + SIZEOF_HEADERS;
   .interp         : { *(.interp) }
   .reginfo        : { *(.reginfo) }
   .note.gnu.build-id : { *(.note.gnu.build-id) }
diff --git a/mipsel-linux-android/lib/ldscripts/elf32btsmipn32.xdc b/mipsel-linux-android/lib/ldscripts/elf32btsmipn32.xdc
index 74231ef..eff528d 100644
--- a/mipsel-linux-android/lib/ldscripts/elf32btsmipn32.xdc
+++ b/mipsel-linux-android/lib/ldscripts/elf32btsmipn32.xdc
@@ -6,7 +6,7 @@
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  . = 0 + SIZEOF_HEADERS;
+  PROVIDE (__executable_start = 0); . = 0 + SIZEOF_HEADERS;
   .interp         : { *(.interp) }
   .reginfo        : { *(.reginfo) }
   .note.gnu.build-id : { *(.note.gnu.build-id) }
diff --git a/mipsel-linux-android/lib/ldscripts/elf32btsmipn32.xdw b/mipsel-linux-android/lib/ldscripts/elf32btsmipn32.xdw
index e1811ef..03e5346 100644
--- a/mipsel-linux-android/lib/ldscripts/elf32btsmipn32.xdw
+++ b/mipsel-linux-android/lib/ldscripts/elf32btsmipn32.xdw
@@ -6,7 +6,7 @@
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  . = 0 + SIZEOF_HEADERS;
+  PROVIDE (__executable_start = 0); . = 0 + SIZEOF_HEADERS;
   .interp         : { *(.interp) }
   .reginfo        : { *(.reginfo) }
   .note.gnu.build-id : { *(.note.gnu.build-id) }
diff --git a/mipsel-linux-android/lib/ldscripts/elf32ltsmip.xd b/mipsel-linux-android/lib/ldscripts/elf32ltsmip.xd
index 3fb8bdc..8faff51 100644
--- a/mipsel-linux-android/lib/ldscripts/elf32ltsmip.xd
+++ b/mipsel-linux-android/lib/ldscripts/elf32ltsmip.xd
@@ -6,7 +6,7 @@
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  . = 0 + SIZEOF_HEADERS;
+  PROVIDE (__executable_start = 0); . = 0 + SIZEOF_HEADERS;
   .interp         : { *(.interp) }
   .reginfo        : { *(.reginfo) }
   .note.gnu.build-id : { *(.note.gnu.build-id) }
diff --git a/mipsel-linux-android/lib/ldscripts/elf32ltsmip.xdc b/mipsel-linux-android/lib/ldscripts/elf32ltsmip.xdc
index 343b371..b20b1c2 100644
--- a/mipsel-linux-android/lib/ldscripts/elf32ltsmip.xdc
+++ b/mipsel-linux-android/lib/ldscripts/elf32ltsmip.xdc
@@ -6,7 +6,7 @@
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  . = 0 + SIZEOF_HEADERS;
+  PROVIDE (__executable_start = 0); . = 0 + SIZEOF_HEADERS;
   .interp         : { *(.interp) }
   .reginfo        : { *(.reginfo) }
   .note.gnu.build-id : { *(.note.gnu.build-id) }
diff --git a/mipsel-linux-android/lib/ldscripts/elf32ltsmip.xdw b/mipsel-linux-android/lib/ldscripts/elf32ltsmip.xdw
index 4e78aaf..75a9491 100644
--- a/mipsel-linux-android/lib/ldscripts/elf32ltsmip.xdw
+++ b/mipsel-linux-android/lib/ldscripts/elf32ltsmip.xdw
@@ -6,7 +6,7 @@
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  . = 0 + SIZEOF_HEADERS;
+  PROVIDE (__executable_start = 0); . = 0 + SIZEOF_HEADERS;
   .interp         : { *(.interp) }
   .reginfo        : { *(.reginfo) }
   .note.gnu.build-id : { *(.note.gnu.build-id) }
diff --git a/mipsel-linux-android/lib/ldscripts/elf32ltsmipn32.xd b/mipsel-linux-android/lib/ldscripts/elf32ltsmipn32.xd
index ac398c4..079fbe2 100644
--- a/mipsel-linux-android/lib/ldscripts/elf32ltsmipn32.xd
+++ b/mipsel-linux-android/lib/ldscripts/elf32ltsmipn32.xd
@@ -6,7 +6,7 @@
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  . = 0 + SIZEOF_HEADERS;
+  PROVIDE (__executable_start = 0); . = 0 + SIZEOF_HEADERS;
   .interp         : { *(.interp) }
   .reginfo        : { *(.reginfo) }
   .note.gnu.build-id : { *(.note.gnu.build-id) }
diff --git a/mipsel-linux-android/lib/ldscripts/elf32ltsmipn32.xdc b/mipsel-linux-android/lib/ldscripts/elf32ltsmipn32.xdc
index 01cc40c..b1a8504 100644
--- a/mipsel-linux-android/lib/ldscripts/elf32ltsmipn32.xdc
+++ b/mipsel-linux-android/lib/ldscripts/elf32ltsmipn32.xdc
@@ -6,7 +6,7 @@
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  . = 0 + SIZEOF_HEADERS;
+  PROVIDE (__executable_start = 0); . = 0 + SIZEOF_HEADERS;
   .interp         : { *(.interp) }
   .reginfo        : { *(.reginfo) }
   .note.gnu.build-id : { *(.note.gnu.build-id) }
diff --git a/mipsel-linux-android/lib/ldscripts/elf32ltsmipn32.xdw b/mipsel-linux-android/lib/ldscripts/elf32ltsmipn32.xdw
index 51b26aa..b3cd40e 100644
--- a/mipsel-linux-android/lib/ldscripts/elf32ltsmipn32.xdw
+++ b/mipsel-linux-android/lib/ldscripts/elf32ltsmipn32.xdw
@@ -6,7 +6,7 @@
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  . = 0 + SIZEOF_HEADERS;
+  PROVIDE (__executable_start = 0); . = 0 + SIZEOF_HEADERS;
   .interp         : { *(.interp) }
   .reginfo        : { *(.reginfo) }
   .note.gnu.build-id : { *(.note.gnu.build-id) }
diff --git a/mipsel-linux-android/lib/ldscripts/elf64btsmip.xd b/mipsel-linux-android/lib/ldscripts/elf64btsmip.xd
index 696b9f1..ac6aa06 100644
--- a/mipsel-linux-android/lib/ldscripts/elf64btsmip.xd
+++ b/mipsel-linux-android/lib/ldscripts/elf64btsmip.xd
@@ -6,7 +6,7 @@
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  . = 0 + SIZEOF_HEADERS;
+  PROVIDE (__executable_start = 0); . = 0 + SIZEOF_HEADERS;
   .MIPS.options : { *(.MIPS.options) }
   .note.gnu.build-id : { *(.note.gnu.build-id) }
   .dynamic        : { *(.dynamic) }
diff --git a/mipsel-linux-android/lib/ldscripts/elf64btsmip.xdc b/mipsel-linux-android/lib/ldscripts/elf64btsmip.xdc
index 29d86a8..b820841 100644
--- a/mipsel-linux-android/lib/ldscripts/elf64btsmip.xdc
+++ b/mipsel-linux-android/lib/ldscripts/elf64btsmip.xdc
@@ -6,7 +6,7 @@
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  . = 0 + SIZEOF_HEADERS;
+  PROVIDE (__executable_start = 0); . = 0 + SIZEOF_HEADERS;
   .MIPS.options : { *(.MIPS.options) }
   .note.gnu.build-id : { *(.note.gnu.build-id) }
   .dynamic        : { *(.dynamic) }
diff --git a/mipsel-linux-android/lib/ldscripts/elf64btsmip.xdw b/mipsel-linux-android/lib/ldscripts/elf64btsmip.xdw
index 1729043..0a9fa6a 100644
--- a/mipsel-linux-android/lib/ldscripts/elf64btsmip.xdw
+++ b/mipsel-linux-android/lib/ldscripts/elf64btsmip.xdw
@@ -6,7 +6,7 @@
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  . = 0 + SIZEOF_HEADERS;
+  PROVIDE (__executable_start = 0); . = 0 + SIZEOF_HEADERS;
   .MIPS.options : { *(.MIPS.options) }
   .note.gnu.build-id : { *(.note.gnu.build-id) }
   .dynamic        : { *(.dynamic) }
diff --git a/mipsel-linux-android/lib/ldscripts/elf64ltsmip.xd b/mipsel-linux-android/lib/ldscripts/elf64ltsmip.xd
index 1c38f26..3499788 100644
--- a/mipsel-linux-android/lib/ldscripts/elf64ltsmip.xd
+++ b/mipsel-linux-android/lib/ldscripts/elf64ltsmip.xd
@@ -6,7 +6,7 @@
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  . = 0 + SIZEOF_HEADERS;
+  PROVIDE (__executable_start = 0); . = 0 + SIZEOF_HEADERS;
   .MIPS.options : { *(.MIPS.options) }
   .note.gnu.build-id : { *(.note.gnu.build-id) }
   .dynamic        : { *(.dynamic) }
diff --git a/mipsel-linux-android/lib/ldscripts/elf64ltsmip.xdc b/mipsel-linux-android/lib/ldscripts/elf64ltsmip.xdc
index f5229b2..dafbacf 100644
--- a/mipsel-linux-android/lib/ldscripts/elf64ltsmip.xdc
+++ b/mipsel-linux-android/lib/ldscripts/elf64ltsmip.xdc
@@ -6,7 +6,7 @@
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  . = 0 + SIZEOF_HEADERS;
+  PROVIDE (__executable_start = 0); . = 0 + SIZEOF_HEADERS;
   .MIPS.options : { *(.MIPS.options) }
   .note.gnu.build-id : { *(.note.gnu.build-id) }
   .dynamic        : { *(.dynamic) }
diff --git a/mipsel-linux-android/lib/ldscripts/elf64ltsmip.xdw b/mipsel-linux-android/lib/ldscripts/elf64ltsmip.xdw
index ea44002..1849f21 100644
--- a/mipsel-linux-android/lib/ldscripts/elf64ltsmip.xdw
+++ b/mipsel-linux-android/lib/ldscripts/elf64ltsmip.xdw
@@ -6,7 +6,7 @@
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  . = 0 + SIZEOF_HEADERS;
+  PROVIDE (__executable_start = 0); . = 0 + SIZEOF_HEADERS;
   .MIPS.options : { *(.MIPS.options) }
   .note.gnu.build-id : { *(.note.gnu.build-id) }
   .dynamic        : { *(.dynamic) }