summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJing Yu <jingyu@google.com>2012-04-20 15:57:38 -0700
committerJing Yu <jingyu@google.com>2012-04-20 15:57:38 -0700
commitc37b4114392d70959fb232a9335c3e92d3d2907b (patch)
treecb51399355bc3c852f4e2e6e9fb45479dc0695f5
parent17c98a270a2bef647ade37c2dc1e66e05804ea37 (diff)
downloadarm-linux-androideabi-4.6-c37b4114392d70959fb232a9335c3e92d3d2907b.tar.gz
checkin Mac 64bit androideabi toolchain.
Change-Id: If09b9b003214f558e55ae710c7baef5127b7332b
-rw-r--r--SOURCES12
-rwxr-xr-xarm-linux-androideabi/bin/arbin796180 -> 903048 bytes
-rwxr-xr-xarm-linux-androideabi/bin/asbin1375680 -> 1595648 bytes
-rwxr-xr-xarm-linux-androideabi/bin/c++bin345188 -> 398896 bytes
-rwxr-xr-xarm-linux-androideabi/bin/g++bin345188 -> 398896 bytes
-rwxr-xr-xarm-linux-androideabi/bin/gccbin341028 -> 398824 bytes
-rwxr-xr-xarm-linux-androideabi/bin/ldbin6203720 -> 6432008 bytes
-rwxr-xr-xarm-linux-androideabi/bin/ld.bfdbin1278688 -> 1410992 bytes
-rwxr-xr-xarm-linux-androideabi/bin/ld.goldbin6203720 -> 6432008 bytes
-rwxr-xr-xarm-linux-androideabi/bin/nmbin782700 -> 884408 bytes
-rwxr-xr-xarm-linux-androideabi/bin/objcopybin965036 -> 1087248 bytes
-rwxr-xr-xarm-linux-androideabi/bin/objdumpbin1130368 -> 1284656 bytes
-rwxr-xr-xarm-linux-androideabi/bin/ranlibbin796176 -> 903040 bytes
-rwxr-xr-xarm-linux-androideabi/bin/stripbin965036 -> 1087248 bytes
-rwxr-xr-xbin/arm-linux-androideabi-addr2linebin765964 -> 866920 bytes
-rwxr-xr-xbin/arm-linux-androideabi-arbin796180 -> 903048 bytes
-rwxr-xr-xbin/arm-linux-androideabi-asbin1375680 -> 1595648 bytes
-rwxr-xr-xbin/arm-linux-androideabi-c++bin345188 -> 398896 bytes
-rwxr-xr-xbin/arm-linux-androideabi-c++filtbin760172 -> 860856 bytes
-rwxr-xr-xbin/arm-linux-androideabi-cppbin341084 -> 398888 bytes
-rwxr-xr-xbin/arm-linux-androideabi-elfeditbin72484 -> 74112 bytes
-rwxr-xr-xbin/arm-linux-androideabi-g++bin345188 -> 398896 bytes
-rwxr-xr-xbin/arm-linux-androideabi-gccbin341028 -> 398824 bytes
-rwxr-xr-xbin/arm-linux-androideabi-gcc-4.6.x-googlebin341028 -> 398824 bytes
-rwxr-xr-xbin/arm-linux-androideabi-gcovbin135452 -> 147640 bytes
-rwxr-xr-xbin/arm-linux-androideabi-gdbbin4774736 -> 5395496 bytes
-rwxr-xr-xbin/arm-linux-androideabi-gdbtuibin4774752 -> 5395512 bytes
-rwxr-xr-xbin/arm-linux-androideabi-gprofbin848360 -> 947320 bytes
-rwxr-xr-xbin/arm-linux-androideabi-ldbin6203720 -> 6432008 bytes
-rwxr-xr-xbin/arm-linux-androideabi-ld.bfdbin1278688 -> 1410992 bytes
-rwxr-xr-xbin/arm-linux-androideabi-ld.goldbin6203720 -> 6432008 bytes
-rwxr-xr-xbin/arm-linux-androideabi-nmbin782700 -> 884408 bytes
-rwxr-xr-xbin/arm-linux-androideabi-objcopybin965036 -> 1087248 bytes
-rwxr-xr-xbin/arm-linux-androideabi-objdumpbin1130368 -> 1284656 bytes
-rwxr-xr-xbin/arm-linux-androideabi-ranlibbin796176 -> 903040 bytes
-rwxr-xr-xbin/arm-linux-androideabi-readelfbin414452 -> 408072 bytes
-rwxr-xr-xbin/arm-linux-androideabi-runbin980000 -> 1095800 bytes
-rwxr-xr-xbin/arm-linux-androideabi-sizebin767916 -> 869184 bytes
-rwxr-xr-xbin/arm-linux-androideabi-stringsbin765964 -> 866952 bytes
-rwxr-xr-xbin/arm-linux-androideabi-stripbin965036 -> 1087248 bytes
-rw-r--r--lib/gcc/arm-linux-androideabi/4.6.x-google/armv7-a/libgcc.abin511764 -> 511764 bytes
-rw-r--r--lib/gcc/arm-linux-androideabi/4.6.x-google/armv7-a/libgcov.abin274600 -> 274600 bytes
-rw-r--r--lib/gcc/arm-linux-androideabi/4.6.x-google/armv7-a/thumb/libgcc.abin502412 -> 502412 bytes
-rw-r--r--lib/gcc/arm-linux-androideabi/4.6.x-google/armv7-a/thumb/libgcov.abin268800 -> 268800 bytes
-rw-r--r--lib/gcc/arm-linux-androideabi/4.6.x-google/install-tools/mkheaders.conf2
-rw-r--r--lib/gcc/arm-linux-androideabi/4.6.x-google/libgcc.abin511352 -> 511352 bytes
-rw-r--r--lib/gcc/arm-linux-androideabi/4.6.x-google/libgcov.abin274192 -> 274192 bytes
-rw-r--r--lib/gcc/arm-linux-androideabi/4.6.x-google/plugin/include/auto-host.h8
-rw-r--r--lib/gcc/arm-linux-androideabi/4.6.x-google/plugin/include/configargs.h2
-rw-r--r--lib/gcc/arm-linux-androideabi/4.6.x-google/thumb/libgcc.abin512896 -> 512896 bytes
-rw-r--r--lib/gcc/arm-linux-androideabi/4.6.x-google/thumb/libgcov.abin267952 -> 267952 bytes
-rw-r--r--lib/libarm-linux-android-sim.abin715296 -> 889464 bytes
-rw-r--r--lib/libbfd.abin3976120 -> 0 bytes
-rw-r--r--lib/libiberty.abin744936 -> 0 bytes
-rw-r--r--lib/libintl.abin143496 -> 0 bytes
-rw-r--r--lib/x86_64/libiberty.abin0 -> 940664 bytes
-rw-r--r--lib32/Android.mk (renamed from lib/Android.mk)0
-rw-r--r--lib32/libbfd.abin0 -> 850280 bytes
-rwxr-xr-xlib32/libbfd.la (renamed from lib/libbfd.la)2
-rw-r--r--lib32/libiberty.abin0 -> 325632 bytes
-rw-r--r--lib32/libintl.abin0 -> 60232 bytes
-rwxr-xr-xlibexec/gcc/arm-linux-androideabi/4.6.x-google/cc1bin12190980 -> 12972384 bytes
-rwxr-xr-xlibexec/gcc/arm-linux-androideabi/4.6.x-google/cc1plusbin13148324 -> 14030208 bytes
-rwxr-xr-xlibexec/gcc/arm-linux-androideabi/4.6.x-google/collect2bin161952 -> 180200 bytes
-rwxr-xr-xlibexec/gcc/arm-linux-androideabi/4.6.x-google/install-tools/fixinclbin224884 -> 252776 bytes
-rwxr-xr-xlibexec/gcc/arm-linux-androideabi/4.6.x-google/libfunction_reordering_plugin.0.sobin33728 -> 36208 bytes
-rwxr-xr-xlibexec/gcc/arm-linux-androideabi/4.6.x-google/liblto_plugin.0.sobin83104 -> 92416 bytes
-rwxr-xr-xlibexec/gcc/arm-linux-androideabi/4.6.x-google/lto-wrapperbin46204 -> 48168 bytes
-rwxr-xr-xlibexec/gcc/arm-linux-androideabi/4.6.x-google/lto1bin11531276 -> 12244384 bytes
69 files changed, 13 insertions, 13 deletions
diff --git a/SOURCES b/SOURCES
index e8b9c06..aec5aa0 100644
--- a/SOURCES
+++ b/SOURCES
@@ -2,9 +2,9 @@ Sources for this prebuilt toolchain can be downloaded from Android Opensource
Project GIT repository git://android.googlesource.com/toolchain.
Configure options:
-export CC="gcc -m32 -isystem /Developer/SDKs/MacOSX10.4u.sdk/usr/include -mmacosx-version-min=10.4 -Wno-format -Wno-deprecated-declarations"
-export CXX="g++ -m32 -isystem /Developer/SDKs/MacOSX10.4u.sdk/usr/include -mmacosx-version-min=10.4 -Wno-format -Wno-deprecated-declarations"
-export ABI=32
+export CC="gcc -m64 -isystem /Developer/SDKs/MacOSX10.4u.sdk/usr/include -mmacosx-version-min=10.4 -Wno-format -Wno-deprecated-declarations"
+export CXX="g++ -m64 -isystem /Developer/SDKs/MacOSX10.4u.sdk/usr/include -mmacosx-version-min=10.4 -Wno-format -Wno-deprecated-declarations"
+export ABI=64
export LDFLAGS=-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk
path/to/build/configure --target=arm-linux-androideabi \
--host=i686-apple-darwin --build=i686-apple-darwin \
@@ -40,9 +40,9 @@ mpfr/ synced to
Date: Thu Nov 5 17:50:13 2009 -0800
build/ synced to
- commit 5ef7fa6f214e96660a9b16343fea904831e5e6e2
- Author: Jing Yu <jingyu@google.com>
- Date: Wed Feb 15 16:03:22 2012 -0800
+ commit bdb501d14ede0c21cd6bd73699b01ec027637d5f
+ Author: Jing Yu <jingyu@google.com>
+ Date: Fri Apr 20 15:18:24 2012 -0700
expat/ synced to
commit 40172a0ae9d40a068f1e1a48ffcf6a1ccf765ed5
diff --git a/arm-linux-androideabi/bin/ar b/arm-linux-androideabi/bin/ar
index ea0454b..b721f6c 100755
--- a/arm-linux-androideabi/bin/ar
+++ b/arm-linux-androideabi/bin/ar
Binary files differ
diff --git a/arm-linux-androideabi/bin/as b/arm-linux-androideabi/bin/as
index 2bb1ce7..630bf4f 100755
--- a/arm-linux-androideabi/bin/as
+++ b/arm-linux-androideabi/bin/as
Binary files differ
diff --git a/arm-linux-androideabi/bin/c++ b/arm-linux-androideabi/bin/c++
index 2b012bc..43370d3 100755
--- a/arm-linux-androideabi/bin/c++
+++ b/arm-linux-androideabi/bin/c++
Binary files differ
diff --git a/arm-linux-androideabi/bin/g++ b/arm-linux-androideabi/bin/g++
index 2b012bc..43370d3 100755
--- a/arm-linux-androideabi/bin/g++
+++ b/arm-linux-androideabi/bin/g++
Binary files differ
diff --git a/arm-linux-androideabi/bin/gcc b/arm-linux-androideabi/bin/gcc
index 6dabbea..6a31848 100755
--- a/arm-linux-androideabi/bin/gcc
+++ b/arm-linux-androideabi/bin/gcc
Binary files differ
diff --git a/arm-linux-androideabi/bin/ld b/arm-linux-androideabi/bin/ld
index 42914e8..2438c4b 100755
--- a/arm-linux-androideabi/bin/ld
+++ b/arm-linux-androideabi/bin/ld
Binary files differ
diff --git a/arm-linux-androideabi/bin/ld.bfd b/arm-linux-androideabi/bin/ld.bfd
index d222f76..36bd599 100755
--- a/arm-linux-androideabi/bin/ld.bfd
+++ b/arm-linux-androideabi/bin/ld.bfd
Binary files differ
diff --git a/arm-linux-androideabi/bin/ld.gold b/arm-linux-androideabi/bin/ld.gold
index 42914e8..2438c4b 100755
--- a/arm-linux-androideabi/bin/ld.gold
+++ b/arm-linux-androideabi/bin/ld.gold
Binary files differ
diff --git a/arm-linux-androideabi/bin/nm b/arm-linux-androideabi/bin/nm
index 2e26073..5ef691e 100755
--- a/arm-linux-androideabi/bin/nm
+++ b/arm-linux-androideabi/bin/nm
Binary files differ
diff --git a/arm-linux-androideabi/bin/objcopy b/arm-linux-androideabi/bin/objcopy
index 25a02cc..7d2fea0 100755
--- a/arm-linux-androideabi/bin/objcopy
+++ b/arm-linux-androideabi/bin/objcopy
Binary files differ
diff --git a/arm-linux-androideabi/bin/objdump b/arm-linux-androideabi/bin/objdump
index cf22dad..9e0539a 100755
--- a/arm-linux-androideabi/bin/objdump
+++ b/arm-linux-androideabi/bin/objdump
Binary files differ
diff --git a/arm-linux-androideabi/bin/ranlib b/arm-linux-androideabi/bin/ranlib
index d55b24a..da50d36 100755
--- a/arm-linux-androideabi/bin/ranlib
+++ b/arm-linux-androideabi/bin/ranlib
Binary files differ
diff --git a/arm-linux-androideabi/bin/strip b/arm-linux-androideabi/bin/strip
index 05fd1d4..32ba962 100755
--- a/arm-linux-androideabi/bin/strip
+++ b/arm-linux-androideabi/bin/strip
Binary files differ
diff --git a/bin/arm-linux-androideabi-addr2line b/bin/arm-linux-androideabi-addr2line
index 743a8c5..0b6ff52 100755
--- a/bin/arm-linux-androideabi-addr2line
+++ b/bin/arm-linux-androideabi-addr2line
Binary files differ
diff --git a/bin/arm-linux-androideabi-ar b/bin/arm-linux-androideabi-ar
index ea0454b..b721f6c 100755
--- a/bin/arm-linux-androideabi-ar
+++ b/bin/arm-linux-androideabi-ar
Binary files differ
diff --git a/bin/arm-linux-androideabi-as b/bin/arm-linux-androideabi-as
index 2bb1ce7..630bf4f 100755
--- a/bin/arm-linux-androideabi-as
+++ b/bin/arm-linux-androideabi-as
Binary files differ
diff --git a/bin/arm-linux-androideabi-c++ b/bin/arm-linux-androideabi-c++
index 2b012bc..43370d3 100755
--- a/bin/arm-linux-androideabi-c++
+++ b/bin/arm-linux-androideabi-c++
Binary files differ
diff --git a/bin/arm-linux-androideabi-c++filt b/bin/arm-linux-androideabi-c++filt
index 501c2ec..1799870 100755
--- a/bin/arm-linux-androideabi-c++filt
+++ b/bin/arm-linux-androideabi-c++filt
Binary files differ
diff --git a/bin/arm-linux-androideabi-cpp b/bin/arm-linux-androideabi-cpp
index d63919b..230985c 100755
--- a/bin/arm-linux-androideabi-cpp
+++ b/bin/arm-linux-androideabi-cpp
Binary files differ
diff --git a/bin/arm-linux-androideabi-elfedit b/bin/arm-linux-androideabi-elfedit
index 0ae3387..441321c 100755
--- a/bin/arm-linux-androideabi-elfedit
+++ b/bin/arm-linux-androideabi-elfedit
Binary files differ
diff --git a/bin/arm-linux-androideabi-g++ b/bin/arm-linux-androideabi-g++
index 2b012bc..43370d3 100755
--- a/bin/arm-linux-androideabi-g++
+++ b/bin/arm-linux-androideabi-g++
Binary files differ
diff --git a/bin/arm-linux-androideabi-gcc b/bin/arm-linux-androideabi-gcc
index 6dabbea..6a31848 100755
--- a/bin/arm-linux-androideabi-gcc
+++ b/bin/arm-linux-androideabi-gcc
Binary files differ
diff --git a/bin/arm-linux-androideabi-gcc-4.6.x-google b/bin/arm-linux-androideabi-gcc-4.6.x-google
index 6dabbea..6a31848 100755
--- a/bin/arm-linux-androideabi-gcc-4.6.x-google
+++ b/bin/arm-linux-androideabi-gcc-4.6.x-google
Binary files differ
diff --git a/bin/arm-linux-androideabi-gcov b/bin/arm-linux-androideabi-gcov
index 016dbc4..317669e 100755
--- a/bin/arm-linux-androideabi-gcov
+++ b/bin/arm-linux-androideabi-gcov
Binary files differ
diff --git a/bin/arm-linux-androideabi-gdb b/bin/arm-linux-androideabi-gdb
index cb6d97f..81df285 100755
--- a/bin/arm-linux-androideabi-gdb
+++ b/bin/arm-linux-androideabi-gdb
Binary files differ
diff --git a/bin/arm-linux-androideabi-gdbtui b/bin/arm-linux-androideabi-gdbtui
index a6a5501..ac72ae8 100755
--- a/bin/arm-linux-androideabi-gdbtui
+++ b/bin/arm-linux-androideabi-gdbtui
Binary files differ
diff --git a/bin/arm-linux-androideabi-gprof b/bin/arm-linux-androideabi-gprof
index 83e37bd..5b21202 100755
--- a/bin/arm-linux-androideabi-gprof
+++ b/bin/arm-linux-androideabi-gprof
Binary files differ
diff --git a/bin/arm-linux-androideabi-ld b/bin/arm-linux-androideabi-ld
index 42914e8..2438c4b 100755
--- a/bin/arm-linux-androideabi-ld
+++ b/bin/arm-linux-androideabi-ld
Binary files differ
diff --git a/bin/arm-linux-androideabi-ld.bfd b/bin/arm-linux-androideabi-ld.bfd
index d222f76..36bd599 100755
--- a/bin/arm-linux-androideabi-ld.bfd
+++ b/bin/arm-linux-androideabi-ld.bfd
Binary files differ
diff --git a/bin/arm-linux-androideabi-ld.gold b/bin/arm-linux-androideabi-ld.gold
index 42914e8..2438c4b 100755
--- a/bin/arm-linux-androideabi-ld.gold
+++ b/bin/arm-linux-androideabi-ld.gold
Binary files differ
diff --git a/bin/arm-linux-androideabi-nm b/bin/arm-linux-androideabi-nm
index 2e26073..5ef691e 100755
--- a/bin/arm-linux-androideabi-nm
+++ b/bin/arm-linux-androideabi-nm
Binary files differ
diff --git a/bin/arm-linux-androideabi-objcopy b/bin/arm-linux-androideabi-objcopy
index 25a02cc..7d2fea0 100755
--- a/bin/arm-linux-androideabi-objcopy
+++ b/bin/arm-linux-androideabi-objcopy
Binary files differ
diff --git a/bin/arm-linux-androideabi-objdump b/bin/arm-linux-androideabi-objdump
index cf22dad..9e0539a 100755
--- a/bin/arm-linux-androideabi-objdump
+++ b/bin/arm-linux-androideabi-objdump
Binary files differ
diff --git a/bin/arm-linux-androideabi-ranlib b/bin/arm-linux-androideabi-ranlib
index d55b24a..da50d36 100755
--- a/bin/arm-linux-androideabi-ranlib
+++ b/bin/arm-linux-androideabi-ranlib
Binary files differ
diff --git a/bin/arm-linux-androideabi-readelf b/bin/arm-linux-androideabi-readelf
index 0b7eddd..1a7cac3 100755
--- a/bin/arm-linux-androideabi-readelf
+++ b/bin/arm-linux-androideabi-readelf
Binary files differ
diff --git a/bin/arm-linux-androideabi-run b/bin/arm-linux-androideabi-run
index cc62ab4..71e2af3 100755
--- a/bin/arm-linux-androideabi-run
+++ b/bin/arm-linux-androideabi-run
Binary files differ
diff --git a/bin/arm-linux-androideabi-size b/bin/arm-linux-androideabi-size
index cb84ae8..3caf953 100755
--- a/bin/arm-linux-androideabi-size
+++ b/bin/arm-linux-androideabi-size
Binary files differ
diff --git a/bin/arm-linux-androideabi-strings b/bin/arm-linux-androideabi-strings
index d1488a5..83a86aa 100755
--- a/bin/arm-linux-androideabi-strings
+++ b/bin/arm-linux-androideabi-strings
Binary files differ
diff --git a/bin/arm-linux-androideabi-strip b/bin/arm-linux-androideabi-strip
index 05fd1d4..32ba962 100755
--- a/bin/arm-linux-androideabi-strip
+++ b/bin/arm-linux-androideabi-strip
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.6.x-google/armv7-a/libgcc.a b/lib/gcc/arm-linux-androideabi/4.6.x-google/armv7-a/libgcc.a
index 5e10a76..60e7737 100644
--- a/lib/gcc/arm-linux-androideabi/4.6.x-google/armv7-a/libgcc.a
+++ b/lib/gcc/arm-linux-androideabi/4.6.x-google/armv7-a/libgcc.a
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.6.x-google/armv7-a/libgcov.a b/lib/gcc/arm-linux-androideabi/4.6.x-google/armv7-a/libgcov.a
index d79da27..1aab096 100644
--- a/lib/gcc/arm-linux-androideabi/4.6.x-google/armv7-a/libgcov.a
+++ b/lib/gcc/arm-linux-androideabi/4.6.x-google/armv7-a/libgcov.a
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.6.x-google/armv7-a/thumb/libgcc.a b/lib/gcc/arm-linux-androideabi/4.6.x-google/armv7-a/thumb/libgcc.a
index 24293c2..8a8df05 100644
--- a/lib/gcc/arm-linux-androideabi/4.6.x-google/armv7-a/thumb/libgcc.a
+++ b/lib/gcc/arm-linux-androideabi/4.6.x-google/armv7-a/thumb/libgcc.a
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.6.x-google/armv7-a/thumb/libgcov.a b/lib/gcc/arm-linux-androideabi/4.6.x-google/armv7-a/thumb/libgcov.a
index a044a9f..96198b7 100644
--- a/lib/gcc/arm-linux-androideabi/4.6.x-google/armv7-a/thumb/libgcov.a
+++ b/lib/gcc/arm-linux-androideabi/4.6.x-google/armv7-a/thumb/libgcov.a
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.6.x-google/install-tools/mkheaders.conf b/lib/gcc/arm-linux-androideabi/4.6.x-google/install-tools/mkheaders.conf
index b9cdfc9..927ef15 100644
--- a/lib/gcc/arm-linux-androideabi/4.6.x-google/install-tools/mkheaders.conf
+++ b/lib/gcc/arm-linux-androideabi/4.6.x-google/install-tools/mkheaders.conf
@@ -1,3 +1,3 @@
-SYSTEM_HEADER_DIR="/Volumes/androidtc/buildtc/install/sysroot${sysroot_headers_suffix}/usr/include"
+SYSTEM_HEADER_DIR="/Volumes/androidtc/build64/install/sysroot${sysroot_headers_suffix}/usr/include"
OTHER_FIXINCLUDES_DIRS=""
STMP_FIXINC="stmp-fixinc"
diff --git a/lib/gcc/arm-linux-androideabi/4.6.x-google/libgcc.a b/lib/gcc/arm-linux-androideabi/4.6.x-google/libgcc.a
index 0c8dc8d..27eb216 100644
--- a/lib/gcc/arm-linux-androideabi/4.6.x-google/libgcc.a
+++ b/lib/gcc/arm-linux-androideabi/4.6.x-google/libgcc.a
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.6.x-google/libgcov.a b/lib/gcc/arm-linux-androideabi/4.6.x-google/libgcov.a
index d2d28ea..2e4d642 100644
--- a/lib/gcc/arm-linux-androideabi/4.6.x-google/libgcov.a
+++ b/lib/gcc/arm-linux-androideabi/4.6.x-google/libgcov.a
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.6.x-google/plugin/include/auto-host.h b/lib/gcc/arm-linux-androideabi/4.6.x-google/plugin/include/auto-host.h
index 0a325eb..7759b85 100644
--- a/lib/gcc/arm-linux-androideabi/4.6.x-google/plugin/include/auto-host.h
+++ b/lib/gcc/arm-linux-androideabi/4.6.x-google/plugin/include/auto-host.h
@@ -1086,7 +1086,7 @@
/* Define if you have the iconv() function. */
#ifndef USED_FOR_TARGET
-#define HAVE_ICONV 1
+/* #undef HAVE_ICONV */
#endif
@@ -1556,7 +1556,7 @@
/* Define as const if the declaration of iconv() needs const. */
#ifndef USED_FOR_TARGET
-#define ICONV_CONST const
+/* #undef ICONV_CONST */
#endif
@@ -1672,7 +1672,7 @@
/* The size of `long', as computed by sizeof. */
#ifndef USED_FOR_TARGET
-#define SIZEOF_LONG 4
+#define SIZEOF_LONG 8
#endif
@@ -1690,7 +1690,7 @@
/* The size of `void *', as computed by sizeof. */
#ifndef USED_FOR_TARGET
-#define SIZEOF_VOID_P 4
+#define SIZEOF_VOID_P 8
#endif
diff --git a/lib/gcc/arm-linux-androideabi/4.6.x-google/plugin/include/configargs.h b/lib/gcc/arm-linux-androideabi/4.6.x-google/plugin/include/configargs.h
index e720593..623b0f2 100644
--- a/lib/gcc/arm-linux-androideabi/4.6.x-google/plugin/include/configargs.h
+++ b/lib/gcc/arm-linux-androideabi/4.6.x-google/plugin/include/configargs.h
@@ -1,5 +1,5 @@
/* Generated automatically. */
-static const char configuration_arguments[] = "/Volumes/androidtc/androidtoolchain/./src/build/../gcc/gcc-4.6/configure --prefix=/usr/local --target=arm-linux-androideabi --host=i686-apple-darwin --build=i686-apple-darwin --with-gnu-as --with-gnu-ld --enable-languages=c,c++ --with-gmp=/Volumes/androidtc/buildtc/obj/temp-install --with-mpfr=/Volumes/androidtc/buildtc/obj/temp-install --with-mpc=/Volumes/androidtc/buildtc/obj/temp-install --without-ppl --without-cloog --disable-libssp --enable-threads --disable-nls --disable-libmudflap --disable-libgomp --disable-libstdc__-v3 --disable-sjlj-exceptions --disable-shared --disable-tls --disable-libitm --with-float=soft --with-fpu=vfp --with-arch=armv5te --enable-target-optspace --with-gcc-version=4.6 --with-binutils-version=2.21 --with-gmp-version=4.2.4 --with-mpfr-version=2.4.1 --with-gdb-version=7.3.x --with-arch=armv5te --with-sysroot=/Volumes/androidtc/buildtc/install/sysroot --with-prefix=/Volumes/androidtc/buildtc/install --with-gold-version=2.21 --enable-gold --program-transform-name='s&^&arm-linux-androideabi-&' --enable-gold=default";
+static const char configuration_arguments[] = "/Volumes/androidtc/androidtoolchain/./src/build/../gcc/gcc-4.6/configure --prefix=/usr/local --target=arm-linux-androideabi --host=x86_64-apple-darwin --build=x86_64-apple-darwin --with-gnu-as --with-gnu-ld --enable-languages=c,c++ --with-gmp=/Volumes/androidtc/build64/obj/temp-install --with-mpfr=/Volumes/androidtc/build64/obj/temp-install --with-mpc=/Volumes/androidtc/build64/obj/temp-install --without-ppl --without-cloog --disable-libssp --enable-threads --disable-nls --disable-libmudflap --disable-libgomp --disable-libstdc__-v3 --disable-sjlj-exceptions --disable-shared --disable-tls --disable-libitm --with-float=soft --with-fpu=vfp --with-arch=armv5te --enable-target-optspace --with-gcc-version=4.6 --with-binutils-version=2.21 --with-gmp-version=4.2.4 --with-mpfr-version=2.4.1 --with-gdb-version=7.3.x --with-arch=armv5te --with-sysroot=/Volumes/androidtc/build64/install/sysroot --with-prefix=/Volumes/androidtc/build64/install --with-gold-version=2.21 --enable-gold --program-transform-name='s&^&arm-linux-androideabi-&' --enable-gold=default";
static const char thread_model[] = "posix";
static const struct {
diff --git a/lib/gcc/arm-linux-androideabi/4.6.x-google/thumb/libgcc.a b/lib/gcc/arm-linux-androideabi/4.6.x-google/thumb/libgcc.a
index 07aa255..d55b535 100644
--- a/lib/gcc/arm-linux-androideabi/4.6.x-google/thumb/libgcc.a
+++ b/lib/gcc/arm-linux-androideabi/4.6.x-google/thumb/libgcc.a
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.6.x-google/thumb/libgcov.a b/lib/gcc/arm-linux-androideabi/4.6.x-google/thumb/libgcov.a
index 8bcf630..013ca28 100644
--- a/lib/gcc/arm-linux-androideabi/4.6.x-google/thumb/libgcov.a
+++ b/lib/gcc/arm-linux-androideabi/4.6.x-google/thumb/libgcov.a
Binary files differ
diff --git a/lib/libarm-linux-android-sim.a b/lib/libarm-linux-android-sim.a
index 94a47f1..76dced9 100644
--- a/lib/libarm-linux-android-sim.a
+++ b/lib/libarm-linux-android-sim.a
Binary files differ
diff --git a/lib/libbfd.a b/lib/libbfd.a
deleted file mode 100644
index ecda03e..0000000
--- a/lib/libbfd.a
+++ /dev/null
Binary files differ
diff --git a/lib/libiberty.a b/lib/libiberty.a
deleted file mode 100644
index e45af2f..0000000
--- a/lib/libiberty.a
+++ /dev/null
Binary files differ
diff --git a/lib/libintl.a b/lib/libintl.a
deleted file mode 100644
index e373a65..0000000
--- a/lib/libintl.a
+++ /dev/null
Binary files differ
diff --git a/lib/x86_64/libiberty.a b/lib/x86_64/libiberty.a
new file mode 100644
index 0000000..260160a
--- /dev/null
+++ b/lib/x86_64/libiberty.a
Binary files differ
diff --git a/lib/Android.mk b/lib32/Android.mk
index a86de8b..a86de8b 100644
--- a/lib/Android.mk
+++ b/lib32/Android.mk
diff --git a/lib32/libbfd.a b/lib32/libbfd.a
new file mode 100644
index 0000000..e352f04
--- /dev/null
+++ b/lib32/libbfd.a
Binary files differ
diff --git a/lib/libbfd.la b/lib32/libbfd.la
index 7ec74d6..52f0ca3 100755
--- a/lib/libbfd.la
+++ b/lib32/libbfd.la
@@ -38,4 +38,4 @@ dlopen=''
dlpreopen=''
# Directory that this library needs to be installed in:
-libdir='/usr/local/i686-apple-darwin/arm-linux-androideabi/lib'
+libdir='/usr/local/x86_64-apple-darwin/arm-linux-androideabi/lib'
diff --git a/lib32/libiberty.a b/lib32/libiberty.a
new file mode 100644
index 0000000..7a76134
--- /dev/null
+++ b/lib32/libiberty.a
Binary files differ
diff --git a/lib32/libintl.a b/lib32/libintl.a
new file mode 100644
index 0000000..576aecf
--- /dev/null
+++ b/lib32/libintl.a
Binary files differ
diff --git a/libexec/gcc/arm-linux-androideabi/4.6.x-google/cc1 b/libexec/gcc/arm-linux-androideabi/4.6.x-google/cc1
index 004e87d..4c8565b 100755
--- a/libexec/gcc/arm-linux-androideabi/4.6.x-google/cc1
+++ b/libexec/gcc/arm-linux-androideabi/4.6.x-google/cc1
Binary files differ
diff --git a/libexec/gcc/arm-linux-androideabi/4.6.x-google/cc1plus b/libexec/gcc/arm-linux-androideabi/4.6.x-google/cc1plus
index 0a49229..7b44c8a 100755
--- a/libexec/gcc/arm-linux-androideabi/4.6.x-google/cc1plus
+++ b/libexec/gcc/arm-linux-androideabi/4.6.x-google/cc1plus
Binary files differ
diff --git a/libexec/gcc/arm-linux-androideabi/4.6.x-google/collect2 b/libexec/gcc/arm-linux-androideabi/4.6.x-google/collect2
index ac81ea3..f93eb42 100755
--- a/libexec/gcc/arm-linux-androideabi/4.6.x-google/collect2
+++ b/libexec/gcc/arm-linux-androideabi/4.6.x-google/collect2
Binary files differ
diff --git a/libexec/gcc/arm-linux-androideabi/4.6.x-google/install-tools/fixincl b/libexec/gcc/arm-linux-androideabi/4.6.x-google/install-tools/fixincl
index 1dfd57f..f797199 100755
--- a/libexec/gcc/arm-linux-androideabi/4.6.x-google/install-tools/fixincl
+++ b/libexec/gcc/arm-linux-androideabi/4.6.x-google/install-tools/fixincl
Binary files differ
diff --git a/libexec/gcc/arm-linux-androideabi/4.6.x-google/libfunction_reordering_plugin.0.so b/libexec/gcc/arm-linux-androideabi/4.6.x-google/libfunction_reordering_plugin.0.so
index 68e693d..c164537 100755
--- a/libexec/gcc/arm-linux-androideabi/4.6.x-google/libfunction_reordering_plugin.0.so
+++ b/libexec/gcc/arm-linux-androideabi/4.6.x-google/libfunction_reordering_plugin.0.so
Binary files differ
diff --git a/libexec/gcc/arm-linux-androideabi/4.6.x-google/liblto_plugin.0.so b/libexec/gcc/arm-linux-androideabi/4.6.x-google/liblto_plugin.0.so
index 0c4130b..d1fbe1a 100755
--- a/libexec/gcc/arm-linux-androideabi/4.6.x-google/liblto_plugin.0.so
+++ b/libexec/gcc/arm-linux-androideabi/4.6.x-google/liblto_plugin.0.so
Binary files differ
diff --git a/libexec/gcc/arm-linux-androideabi/4.6.x-google/lto-wrapper b/libexec/gcc/arm-linux-androideabi/4.6.x-google/lto-wrapper
index 238ef0c..707df2a 100755
--- a/libexec/gcc/arm-linux-androideabi/4.6.x-google/lto-wrapper
+++ b/libexec/gcc/arm-linux-androideabi/4.6.x-google/lto-wrapper
Binary files differ
diff --git a/libexec/gcc/arm-linux-androideabi/4.6.x-google/lto1 b/libexec/gcc/arm-linux-androideabi/4.6.x-google/lto1
index a8ae3fd..53798e6 100755
--- a/libexec/gcc/arm-linux-androideabi/4.6.x-google/lto1
+++ b/libexec/gcc/arm-linux-androideabi/4.6.x-google/lto1
Binary files differ