New x86 toolchain i686-linux-android-4.6

Build instructions:

export NDK=your-AOSP-path/ndk
cd $NDK ; ./build/tools/dev-cleanup.sh
./build/tools/download-toolchain-sources.sh /tmp/ndk-$USER/src
./build/tools/gen-platforms.sh --minimal --dst-dir=$NDK --ndk-dir=$NDK --arch=x86
./build/tools/build-gcc.sh /tmp/ndk-$USER/src $NDK --gdb-version=7.3.x x86-4.6
rm -rf $NDK/toolchains/x86-4.6/prebuilt/linux-x86/sysroot
cp -a $NDK/toolchains/x86-4.6/prebuilt/linux-x86/* $NDK/../prebuilts/gcc/linux-x86/x86/i686-linux-android-4.6

Change-Id: Icba1c1e63f2269a99620e3ad44f87911e106bc4c

65 files changed, 21 insertions, 36 deletions

diff --git a/SOURCES b/SOURCES
index 13e5ccf..5bfae6b 100644
--- a/SOURCES
+++ b/SOURCES
@@ -1,8 +1,8 @@
-toolchain/build.git              777b41ba19cc104b6cefc3b4c408c1121ae95aaa Revert setting GDB_TARGET for i[3456]86-*-linux-android and x86_64-*-linux-android
+toolchain/build.git              6d144f8edfd3879d3c241713331460d9a6e3ee86 Allow --enable-gold co-exists with --enable-ld=default
 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           82d2721b9f7e12245848d8527d1b85822c9e8810 Preserve the original p_align and p_flags if they are valid.
-toolchain/gcc.git                5ac5f4e1140f42e3acf9a59fb7f92b28fcb94203 2012-05-07  Jing Yu  <jingyu@google.com>
+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
diff --git a/bin/i686-linux-android-addr2line b/bin/i686-linux-android-addr2line
index 6341634..63036ac 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 3362fea..8668ba5 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 faa8544..72b036b 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 87c7f67..a9adabf 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 f5cbc15..01894fb 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 f1ff994..9c6a1d0 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 87c7f67..a9adabf 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 75f1267..8aacd11 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.x-google
index 75f1267..8aacd11 100755
--- a/bin/i686-linux-android-gcc-4.6.x-google
+++ b/bin/i686-linux-android-gcc-4.6.x-google
diff --git a/bin/i686-linux-android-gdb b/bin/i686-linux-android-gdb
index 9d59e90..1dd40b8 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 142b997..a45bfde 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 9625328..fc01b90 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 15a7cc1..6de832a 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 15a7cc1..6de832a 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
new file mode 100755
index 0000000..dfe7428
--- /dev/null
+++ b/bin/i686-linux-android-ld.gold
diff --git a/bin/i686-linux-android-nm b/bin/i686-linux-android-nm
index fa64acd..680f086 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 4125473..336dc1b 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 1cf16a1..000417e 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 47cde71..99a8478 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 5c07598..7a04a81 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 93d9e2e..ce75eee 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 c172737..c632675 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 3362fea..8668ba5 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 faa8544..72b036b 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 87c7f67..a9adabf 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 87c7f67..a9adabf 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 75f1267..8aacd11 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 15a7cc1..6de832a 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 15a7cc1..6de832a 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
new file mode 100755
index 0000000..dfe7428
--- /dev/null
+++ b/i686-linux-android/bin/ld.gold
diff --git a/i686-linux-android/bin/nm b/i686-linux-android/bin/nm
index fa64acd..680f086 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 4125473..336dc1b 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 1cf16a1..000417e 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 47cde71..99a8478 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 c172737..c632675 100755
--- a/i686-linux-android/bin/strip
+++ b/i686-linux-android/bin/strip
diff --git a/i686-linux-android/lib/ldscripts/elf_i386.x b/i686-linux-android/lib/ldscripts/elf_i386.x
index ea251b4..16327dc 100644
--- a/i686-linux-android/lib/ldscripts/elf_i386.x
+++ b/i686-linux-android/lib/ldscripts/elf_i386.x
@@ -66,8 +66,7 @@ SECTIONS
   .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
   /* Adjust the address for the data segment.  We want to align at exactly
      a page boundary to make life easier for apriori. */
-  . = ALIGN(4096);
-  . = DATA_SEGMENT_ALIGN(4096,4096);
+  . = ALIGN (CONSTANT (MAXPAGESIZE)); . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
   /* Exception handling  */
   .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }
   .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
diff --git a/i686-linux-android/lib/ldscripts/elf_i386.xbn b/i686-linux-android/lib/ldscripts/elf_i386.xbn
index fbdc5df..cb5de61 100644
--- a/i686-linux-android/lib/ldscripts/elf_i386.xbn
+++ b/i686-linux-android/lib/ldscripts/elf_i386.xbn
@@ -65,8 +65,7 @@ SECTIONS
   .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
   /* Adjust the address for the data segment.  We want to align at exactly
      a page boundary to make life easier for apriori. */
-  . = ALIGN(4096);
-  . = DATA_SEGMENT_ALIGN(4096,4096);
+  . = .;
   /* Exception handling  */
   .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }
   .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
diff --git a/i686-linux-android/lib/ldscripts/elf_i386.xc b/i686-linux-android/lib/ldscripts/elf_i386.xc
index 2900ef4..d58e7d1 100644
--- a/i686-linux-android/lib/ldscripts/elf_i386.xc
+++ b/i686-linux-android/lib/ldscripts/elf_i386.xc
@@ -68,8 +68,7 @@ SECTIONS
   .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
   /* Adjust the address for the data segment.  We want to align at exactly
      a page boundary to make life easier for apriori. */
-  . = ALIGN(4096);
-  . = DATA_SEGMENT_ALIGN(4096,4096);
+  . = ALIGN (CONSTANT (MAXPAGESIZE)); . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
   /* Exception handling  */
   .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }
   .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
diff --git a/i686-linux-android/lib/ldscripts/elf_i386.xd b/i686-linux-android/lib/ldscripts/elf_i386.xd
index 3ce3dd7..168bc07 100644
--- a/i686-linux-android/lib/ldscripts/elf_i386.xd
+++ b/i686-linux-android/lib/ldscripts/elf_i386.xd
@@ -65,8 +65,7 @@ SECTIONS
   .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
   /* Adjust the address for the data segment.  We want to align at exactly
      a page boundary to make life easier for apriori. */
-  . = ALIGN(4096);
-  . = DATA_SEGMENT_ALIGN(4096,4096);
+  . = ALIGN (CONSTANT (MAXPAGESIZE)); . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
   /* Exception handling  */
   .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }
   .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
diff --git a/i686-linux-android/lib/ldscripts/elf_i386.xdc b/i686-linux-android/lib/ldscripts/elf_i386.xdc
index 94d4dae..4496dde 100644
--- a/i686-linux-android/lib/ldscripts/elf_i386.xdc
+++ b/i686-linux-android/lib/ldscripts/elf_i386.xdc
@@ -68,8 +68,7 @@ SECTIONS
   .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
   /* Adjust the address for the data segment.  We want to align at exactly
      a page boundary to make life easier for apriori. */
-  . = ALIGN(4096);
-  . = DATA_SEGMENT_ALIGN(4096,4096);
+  . = ALIGN (CONSTANT (MAXPAGESIZE)); . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
   /* Exception handling  */
   .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }
   .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
diff --git a/i686-linux-android/lib/ldscripts/elf_i386.xdw b/i686-linux-android/lib/ldscripts/elf_i386.xdw
index a5211f3..d240fb0 100644
--- a/i686-linux-android/lib/ldscripts/elf_i386.xdw
+++ b/i686-linux-android/lib/ldscripts/elf_i386.xdw
@@ -68,8 +68,7 @@ SECTIONS
   .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
   /* Adjust the address for the data segment.  We want to align at exactly
      a page boundary to make life easier for apriori. */
-  . = ALIGN(4096);
-  . = DATA_SEGMENT_ALIGN(4096,4096);
+  . = ALIGN (CONSTANT (MAXPAGESIZE)); . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
   /* Exception handling  */
   .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }
   .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
diff --git a/i686-linux-android/lib/ldscripts/elf_i386.xn b/i686-linux-android/lib/ldscripts/elf_i386.xn
index 2926cb6..ace7a01 100644
--- a/i686-linux-android/lib/ldscripts/elf_i386.xn
+++ b/i686-linux-android/lib/ldscripts/elf_i386.xn
@@ -65,8 +65,7 @@ SECTIONS
   .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
   /* Adjust the address for the data segment.  We want to align at exactly
      a page boundary to make life easier for apriori. */
-  . = ALIGN(4096);
-  . = DATA_SEGMENT_ALIGN(4096,4096);
+  . = ALIGN (CONSTANT (MAXPAGESIZE)); . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
   /* Exception handling  */
   .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }
   .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
diff --git a/i686-linux-android/lib/ldscripts/elf_i386.xr b/i686-linux-android/lib/ldscripts/elf_i386.xr
index ec2454f..fe5d02b 100644
--- a/i686-linux-android/lib/ldscripts/elf_i386.xr
+++ b/i686-linux-android/lib/ldscripts/elf_i386.xr
@@ -57,8 +57,6 @@ SECTIONS
   .gcc_except_table 0 : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
   /* Adjust the address for the data segment.  We want to align at exactly
      a page boundary to make life easier for apriori. */
-  . = ALIGN(4096);
-  . = DATA_SEGMENT_ALIGN(4096,4096);
   /* Exception handling  */
   .eh_frame     0 : ONLY_IF_RW { KEEP (*(.eh_frame)) }
   .gcc_except_table 0 : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
diff --git a/i686-linux-android/lib/ldscripts/elf_i386.xs b/i686-linux-android/lib/ldscripts/elf_i386.xs
index f731bdf..ee14884 100644
--- a/i686-linux-android/lib/ldscripts/elf_i386.xs
+++ b/i686-linux-android/lib/ldscripts/elf_i386.xs
@@ -62,8 +62,7 @@ SECTIONS
   .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
   /* Adjust the address for the data segment.  We want to align at exactly
      a page boundary to make life easier for apriori. */
-  . = ALIGN(4096);
-  . = DATA_SEGMENT_ALIGN(4096,4096);
+  . = ALIGN (CONSTANT (MAXPAGESIZE)); . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
   /* Exception handling  */
   .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }
   .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
diff --git a/i686-linux-android/lib/ldscripts/elf_i386.xsc b/i686-linux-android/lib/ldscripts/elf_i386.xsc
index 361a7b3..db28b2d 100644
--- a/i686-linux-android/lib/ldscripts/elf_i386.xsc
+++ b/i686-linux-android/lib/ldscripts/elf_i386.xsc
@@ -66,8 +66,7 @@ SECTIONS
   .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
   /* Adjust the address for the data segment.  We want to align at exactly
      a page boundary to make life easier for apriori. */
-  . = ALIGN(4096);
-  . = DATA_SEGMENT_ALIGN(4096,4096);
+  . = ALIGN (CONSTANT (MAXPAGESIZE)); . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
   /* Exception handling  */
   .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }
   .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
diff --git a/i686-linux-android/lib/ldscripts/elf_i386.xsw b/i686-linux-android/lib/ldscripts/elf_i386.xsw
index b5421be..9d74e32 100644
--- a/i686-linux-android/lib/ldscripts/elf_i386.xsw
+++ b/i686-linux-android/lib/ldscripts/elf_i386.xsw
@@ -65,8 +65,7 @@ SECTIONS
   .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
   /* Adjust the address for the data segment.  We want to align at exactly
      a page boundary to make life easier for apriori. */
-  . = ALIGN(4096);
-  . = DATA_SEGMENT_ALIGN(4096,4096);
+  . = ALIGN (CONSTANT (MAXPAGESIZE)); . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
   /* Exception handling  */
   .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }
   .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
diff --git a/i686-linux-android/lib/ldscripts/elf_i386.xu b/i686-linux-android/lib/ldscripts/elf_i386.xu
index 9b68edc..7b5d8c5 100644
--- a/i686-linux-android/lib/ldscripts/elf_i386.xu
+++ b/i686-linux-android/lib/ldscripts/elf_i386.xu
@@ -57,8 +57,6 @@ SECTIONS
   .gcc_except_table 0 : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
   /* Adjust the address for the data segment.  We want to align at exactly
      a page boundary to make life easier for apriori. */
-  . = ALIGN(4096);
-  . = DATA_SEGMENT_ALIGN(4096,4096);
   /* Exception handling  */
   .eh_frame     0 : ONLY_IF_RW { KEEP (*(.eh_frame)) }
   .gcc_except_table 0 : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
diff --git a/i686-linux-android/lib/ldscripts/elf_i386.xw b/i686-linux-android/lib/ldscripts/elf_i386.xw
index 6a75231..62240ea 100644
--- a/i686-linux-android/lib/ldscripts/elf_i386.xw
+++ b/i686-linux-android/lib/ldscripts/elf_i386.xw
@@ -68,8 +68,7 @@ SECTIONS
   .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
   /* Adjust the address for the data segment.  We want to align at exactly
      a page boundary to make life easier for apriori. */
-  . = ALIGN(4096);
-  . = DATA_SEGMENT_ALIGN(4096,4096);
+  . = ALIGN (CONSTANT (MAXPAGESIZE)); . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
   /* Exception handling  */
   .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }
   .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
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.x-google/include-fixed/asm/posix_types.h
index 174465a..5288339 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.x-google/include-fixed/asm/posix_types.h
@@ -2,7 +2,7 @@
 
     It has been auto-edited by fixincludes from:
 
-	"/home/andrewhsieh/internaldroid/ndk/toolchains/x86-4.6/prebuilt/linux-x86/sysroot/usr/include/asm/posix_types.h"
+	"/tmp/ndk-andrewhsieh/build/toolchain/prefix/sysroot/usr/include/asm/posix_types.h"
 
     This had to be done to correct non-standard usages in the
     original, manufacturer supplied header file.  */
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.x-google/include-fixed/linux/a.out.h
index a35f470..0b5059a 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.x-google/include-fixed/linux/a.out.h
@@ -2,7 +2,7 @@
 
     It has been auto-edited by fixincludes from:
 
-	"/home/andrewhsieh/internaldroid/ndk/toolchains/x86-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/i686-linux-android/4.6.x-google/include-fixed/stdio.h b/lib/gcc/i686-linux-android/4.6.x-google/include-fixed/stdio.h
index 4358bec..f436c47 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include-fixed/stdio.h
+++ b/lib/gcc/i686-linux-android/4.6.x-google/include-fixed/stdio.h
@@ -2,7 +2,7 @@
 
     It has been auto-edited by fixincludes from:
 
-	"/home/andrewhsieh/internaldroid/ndk/toolchains/x86-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/i686-linux-android/4.6.x-google/include-fixed/sys/types.h b/lib/gcc/i686-linux-android/4.6.x-google/include-fixed/sys/types.h
index 74e30ed..be4d572 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/include-fixed/sys/types.h
+++ b/lib/gcc/i686-linux-android/4.6.x-google/include-fixed/sys/types.h
@@ -2,7 +2,7 @@
 
     It has been auto-edited by fixincludes from:
 
-	"/home/andrewhsieh/internaldroid/ndk/toolchains/x86-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/i686-linux-android/4.6.x-google/libgcc.a b/lib/gcc/i686-linux-android/4.6.x-google/libgcc.a
index 697a163..27fde9c 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/libgcc.a
+++ b/lib/gcc/i686-linux-android/4.6.x-google/libgcc.a
diff --git a/lib/gcc/i686-linux-android/4.6.x-google/libgcov.a b/lib/gcc/i686-linux-android/4.6.x-google/libgcov.a
index dc304a8..c66b730 100644
--- a/lib/gcc/i686-linux-android/4.6.x-google/libgcov.a
+++ b/lib/gcc/i686-linux-android/4.6.x-google/libgcov.a
diff --git a/lib/libiberty.a b/lib/libiberty.a
index 315f1d3..044771c 100644
--- a/lib/libiberty.a
+++ b/lib/libiberty.a
diff --git a/lib32/libbfd.a b/lib32/libbfd.a
index 005c4d2..f203508 100644
--- a/lib32/libbfd.a
+++ b/lib32/libbfd.a
diff --git a/lib32/libbfd.la b/lib32/libbfd.la
index 957f4ff..f08f117 100755
--- a/lib32/libbfd.la
+++ b/lib32/libbfd.la
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/andrewhsieh/internaldroid/ndk/toolchains/x86-4.6/prebuilt/linux-x86/x86_64-pc-linux-gnu/i686-linux-android/lib'
+libdir='/tmp/ndk-andrewhsieh/build/toolchain/prefix/x86_64-pc-linux-gnu/i686-linux-android/lib'
diff --git a/lib32/libintl.a b/lib32/libintl.a
index 322d09b..993a555 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.x-google/cc1
index a7afa1c..ac9be5a 100755
--- a/libexec/gcc/i686-linux-android/4.6.x-google/cc1
+++ b/libexec/gcc/i686-linux-android/4.6.x-google/cc1
diff --git a/libexec/gcc/i686-linux-android/4.6.x-google/cc1plus b/libexec/gcc/i686-linux-android/4.6.x-google/cc1plus
index b5b4b48..e073e53 100755
--- a/libexec/gcc/i686-linux-android/4.6.x-google/cc1plus
+++ b/libexec/gcc/i686-linux-android/4.6.x-google/cc1plus
diff --git a/libexec/gcc/i686-linux-android/4.6.x-google/collect2 b/libexec/gcc/i686-linux-android/4.6.x-google/collect2
index 833875a..f9189cf 100755
--- a/libexec/gcc/i686-linux-android/4.6.x-google/collect2
+++ b/libexec/gcc/i686-linux-android/4.6.x-google/collect2
diff --git a/libexec/gcc/i686-linux-android/4.6.x-google/libfunction_reordering_plugin.la b/libexec/gcc/i686-linux-android/4.6.x-google/libfunction_reordering_plugin.la
index 7902af0..8279fc1 100755
--- a/libexec/gcc/i686-linux-android/4.6.x-google/libfunction_reordering_plugin.la
+++ b/libexec/gcc/i686-linux-android/4.6.x-google/libfunction_reordering_plugin.la
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/andrewhsieh/internaldroid/ndk/toolchains/x86-4.6/prebuilt/linux-x86/libexec/gcc/i686-linux-android/4.6.x-google'
+libdir='/tmp/ndk-andrewhsieh/build/toolchain/prefix/libexec/gcc/i686-linux-android/4.6.x-google'
diff --git a/libexec/gcc/i686-linux-android/4.6.x-google/liblto_plugin.la b/libexec/gcc/i686-linux-android/4.6.x-google/liblto_plugin.la
index 93a68fa..8224396 100755
--- a/libexec/gcc/i686-linux-android/4.6.x-google/liblto_plugin.la
+++ b/libexec/gcc/i686-linux-android/4.6.x-google/liblto_plugin.la
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/andrewhsieh/internaldroid/ndk/toolchains/x86-4.6/prebuilt/linux-x86/libexec/gcc/i686-linux-android/4.6.x-google'
+libdir='/tmp/ndk-andrewhsieh/build/toolchain/prefix/libexec/gcc/i686-linux-android/4.6.x-google'
diff --git a/libexec/gcc/i686-linux-android/4.6.x-google/lto1 b/libexec/gcc/i686-linux-android/4.6.x-google/lto1
index c0712ee..7f638de 100755
--- a/libexec/gcc/i686-linux-android/4.6.x-google/lto1
+++ b/libexec/gcc/i686-linux-android/4.6.x-google/lto1