am 4ee7c325: Merge "Disable Clang, due to x86 LDBL_MANT_DIG errors."

* commit '4ee7c325df9662b344304f207faf73cc9c3b735c':
  Disable Clang, due to x86 LDBL_MANT_DIG errors.
This commit is contained in:
Chih-Hung Hsieh
2014-09-04 22:20:48 +00:00
committed by Android Git Automerger

View File

@@ -255,6 +255,10 @@ libm_ld_includes := $(LOCAL_PATH)/upstream-freebsd/lib/msun/ld128/
# libm.a for target. # libm.a for target.
# #
include $(CLEAR_VARS) include $(CLEAR_VARS)
ifneq (,$(filter $(TARGET_ARCH),x86 x86_64))
# Clang has wrong long double sizes for x86.
LOCAL_CLANG := false
endif
LOCAL_MODULE:= libm LOCAL_MODULE:= libm
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_ARM_MODE := arm LOCAL_ARM_MODE := arm
@@ -287,6 +291,10 @@ include $(BUILD_STATIC_LIBRARY)
# libm.so for target. # libm.so for target.
# #
include $(CLEAR_VARS) include $(CLEAR_VARS)
ifneq (,$(filter $(TARGET_ARCH),x86 x86_64))
# Clang has wrong long double sizes for x86.
LOCAL_CLANG := false
endif
LOCAL_MODULE:= libm LOCAL_MODULE:= libm
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_SYSTEM_SHARED_LIBRARIES := libc LOCAL_SYSTEM_SHARED_LIBRARIES := libc