From 3cad1206d25b7970bcda44e0d662cfb8422774cb Mon Sep 17 00:00:00 2001 From: Andrew Hsieh Date: Fri, 12 Dec 2014 13:29:10 +0800 Subject: 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 --- tests/device/test-cpufeatures/jni/Android.mk | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'tests') 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) -- cgit v1.2.3