commit 9ef26a3c4cd2e6d469f771815a07cb820800beb6
author Elliott Hughes <enh@google.com> Thu Jun 11 16:58:22 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 11 16:58:23 2015 +0000
tree aba5cb0482ee5e68fdcab34c6cd4cdf1e75a83d6
parent b90e9b71835957a5f816b9a6da1c23c3b6db4802
parent 173ad0a53e456eccf1c4be68d98557fb12b8e420

Merge "Always build libm with clang."

libm/Android.mk

diff --git a/libm/Android.mk b/libm/Android.mk
index a0c4641..1e29396 100644
--- a/libm/Android.mk
+++ b/libm/Android.mk
@@ -3,11 +3,6 @@
 
 bionic_coverage := false
 
-ifneq (,$(filter $(TARGET_ARCH),x86 x86_64))
-# Clang has wrong long double sizes for x86.
-libm_clang := false
-endif
-
 # -----------------------------------------------------------------------------
 # libm.a
 # -----------------------------------------------------------------------------
@@ -478,7 +473,7 @@
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/upstream-freebsd/lib/msun/src/
 LOCAL_C_INCLUDES_64 += $(LOCAL_PATH)/upstream-freebsd/lib/msun/ld128/
 
-LOCAL_CLANG := $(libm_clang)
+LOCAL_CLANG := true
 LOCAL_ARM_MODE := arm
 LOCAL_CFLAGS := \
     -DFLT_EVAL_METHOD=0 \
@@ -515,7 +510,7 @@
 LOCAL_LDFLAGS_x86 := -Wl,--hash-style=both
 
 LOCAL_MODULE := libm
-LOCAL_CLANG := $(libm_clang)
+LOCAL_CLANG := true
 LOCAL_SYSTEM_SHARED_LIBRARIES := libc
 LOCAL_WHOLE_STATIC_LIBRARIES := libm