diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2015-03-30 18:25:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-30 18:25:28 +0000 |
| commit | ede72c15b2a94c6b899df44c330bc35205615ca0 (patch) | |
| tree | c8a8d549a3c818331c4032844c0c6461a4750ee1 | |
| parent | 6708aa5a3dcc06c96b286e44558ef9870fe4be8e (diff) | |
| parent | d93cdef70975cc62e2e17f37ec974a9e6442fc37 (diff) | |
| download | ndk-ede72c15b2a94c6b899df44c330bc35205615ca0.tar.gz | |
Merge "Compile all gcc toolchains with binutils-2.25"
| -rw-r--r-- | build/tools/dev-defaults.sh | 24 | ||||
| -rwxr-xr-x | build/tools/download-toolchain-sources.sh | 2 | ||||
| -rw-r--r-- | build/tools/prebuilt-common.sh | 1 |
3 files changed, 8 insertions, 19 deletions
diff --git a/build/tools/dev-defaults.sh b/build/tools/dev-defaults.sh index b849743fb..779ca0232 100644 --- a/build/tools/dev-defaults.sh +++ b/build/tools/dev-defaults.sh @@ -56,8 +56,8 @@ FIRST_GCC64_VERSION=4.9 DEFAULT_LLVM_GCC32_VERSION=4.8 DEFAULT_LLVM_GCC64_VERSION=4.9 -DEFAULT_BINUTILS_VERSION=2.24 -DEFAULT_GDB_VERSION=7.3.x +DEFAULT_BINUTILS_VERSION=2.25 +DEFAULT_GDB_VERSION=7.7 DEFAULT_MPFR_VERSION=3.1.1 DEFAULT_GMP_VERSION=5.0.5 DEFAULT_MPC_VERSION=1.0.1 @@ -67,7 +67,7 @@ DEFAULT_PPL_VERSION=1.0 DEFAULT_PYTHON_VERSION=2.7.5 DEFAULT_PERL_VERSION=5.16.2 -RECENT_BINUTILS_VERSION=2.24 +RECENT_BINUTILS_VERSION=2.25 # Default platform to build target binaries against. DEFAULT_PLATFORM=android-9 @@ -268,14 +268,7 @@ get_toolchain_name_list_for_arch () # get_default_binutils_version_for_gcc () { - case $1 in - mips*|aarch64*) echo "2.25";; - *-4.6) echo "2.21";; - *-4.4.3) echo "2.19";; - x86*-4.7) echo "2.23";; # Use 2.23 to get x32 support in ld.gold - *-4.7) echo "2.22";; - *) echo "$DEFAULT_BINUTILS_VERSION";; - esac + echo "$DEFAULT_BINUTILS_VERSION" } # Return the binutils version to be used by default when @@ -287,10 +280,7 @@ get_default_binutils_version_for_gcc () # get_default_binutils_version_for_llvm () { - case $1 in - *-3.3|*-3.2) echo "2.21";; - *) echo "2.24";; - esac + echo "$DEFAULT_BINUTILS_VERSION" } # Return the gdb version to be used by default when building a given @@ -300,7 +290,7 @@ get_default_binutils_version_for_llvm () # get_default_gdb_version_for_gcc () { - echo "7.7"; + echo "$DEFAULT_GDB_VERSION" } # Return the gdbserver version to be used by default when building a given @@ -310,5 +300,5 @@ get_default_gdb_version_for_gcc () # get_default_gdbserver_version_for_gcc () { - echo "7.7"; + echo "$DEFAULT_GDB_VERSION" } diff --git a/build/tools/download-toolchain-sources.sh b/build/tools/download-toolchain-sources.sh index f5de2ee9b..16e3d10bd 100755 --- a/build/tools/download-toolchain-sources.sh +++ b/build/tools/download-toolchain-sources.sh @@ -217,7 +217,7 @@ toolchain_checkout "" $BRANCH ppl . toolchain_checkout "" $BRANCH expat . toolchain_checkout "" $BRANCH binutils binutils-2.24 binutils-2.25 toolchain_checkout "" $BRANCH gcc gcc-4.8 gcc-4.9 -toolchain_checkout "" $BRANCH gdb gdb-7.3.x gdb-7.6 gdb-7.7 +toolchain_checkout "" $BRANCH gdb gdb-7.7 toolchain_checkout "" $BRANCH python Python-2.7.5 toolchain_checkout "" $BRANCH perl perl-5.16.2 toolchain_checkout "" $BRANCH mclinker . diff --git a/build/tools/prebuilt-common.sh b/build/tools/prebuilt-common.sh index 8fba7ddef..2257ac01c 100644 --- a/build/tools/prebuilt-common.sh +++ b/build/tools/prebuilt-common.sh @@ -1092,7 +1092,6 @@ parse_toolchain_name () ARCH="arm64" ABI="arm64-v8a" ABI_CONFIGURE_TARGET="aarch64-linux-android" - # Note: --disable-gold because gold doesn't support aarch64 yet ;; x86-*) ARCH="x86" |