diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-12-12 13:29:10 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2014-12-12 13:29:10 +0800 |
| commit | 3cad1206d25b7970bcda44e0d662cfb8422774cb (patch) | |
| tree | 67bb920319d72b107128ebbf6fec3b68ea705a26 | |
| parent | 51d35f549ee27b03dc337380b4452ed20e39803b (diff) | |
| download | ndk-3cad1206d25b7970bcda44e0d662cfb8422774cb.tar.gz | |
Use default gcc to build platform libs
Use GCC 4.8 (Current default) instead of the first GCC 4.6 which is
deprecated. The only downside observed so far is inconsistent DIV Tag
between A15 (via -mcpu=cortex-a15) object by GCC4.6/binutils-2.21
and crt*.o by GCC4.8/binutils-2.24.
Change-Id: Ibc9db06a4bd8b1ae1d8a7d3846eb8c28c47ff4e7
| -rwxr-xr-x | build/tools/gen-platforms.sh | 2 | ||||
| -rw-r--r-- | tests/device/test-cpufeatures/jni/Android.mk | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/build/tools/gen-platforms.sh b/build/tools/gen-platforms.sh index 9ffca807b..6abca57d3 100755 --- a/build/tools/gen-platforms.sh +++ b/build/tools/gen-platforms.sh @@ -390,7 +390,7 @@ get_default_compiler_for_arch() else # By default we want to use the first gcc (currently 4.6) instead of the default (gcc4.8) # for best compatibility, at least before gcc4.6 (now deprecated) is removed from NDK package - GCC_VERSION=$(get_first_gcc_version_for_arch $ARCH) # $(get_default_gcc_version_for_arch $ARCH) + GCC_VERSION=$(get_default_gcc_version_for_arch $ARCH) # $(get_first_gcc_version_for_arch $ARCH) fi for TAG in $HOST_TAG $HOST_TAG32; do TOOLCHAIN_PREFIX="$NDK_DIR/$(get_toolchain_binprefix_for_arch $ARCH $GCC_VERSION $TAG)" diff --git a/tests/device/test-cpufeatures/jni/Android.mk b/tests/device/test-cpufeatures/jni/Android.mk index 8b20bd0aa..858423c6f 100644 --- a/tests/device/test-cpufeatures/jni/Android.mk +++ b/tests/device/test-cpufeatures/jni/Android.mk @@ -26,8 +26,14 @@ LOCAL_STATIC_LIBRARIES := cpufeatures include $(BUILD_EXECUTABLE) endif +# Disable the following tests for GCC4.6/binutils-2.21 as well because +# platform libs are now built with the new default GCC4.8/binutils-2.24, and crt*.o +# generated by it can't be used by GCC4.6/binutils-2.21 due to inconsistency in +# usage of Tag involves DIV +# ifeq ($(TARGET_ARCH),arm) ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) +ifneq ($(NDK_TOOLCHAIN_VERSION),4.6) include $(CLEAR_VARS) LOCAL_MODULE := test_arm_idiv_support LOCAL_SRC_FILES := test_arm_idiv.c @@ -49,5 +55,6 @@ LOCAL_STATIC_LIBRARIES := cpufeatures include $(BUILD_EXECUTABLE) endif endif +endif $(call import-module,android/cpufeatures) |