From 173ad0a53e456eccf1c4be68d98557fb12b8e420 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Wed, 10 Jun 2015 22:55:09 -0700
Subject: [PATCH] Always build libm with clang.

Change-Id: I00df3b83dfa76a7e12f097fb622ceaec3e2bb5a4
---
 libm/Android.mk | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/libm/Android.mk b/libm/Android.mk
index a0c4641dd..1e293968e 100644
--- a/libm/Android.mk
+++ b/libm/Android.mk
@@ -3,11 +3,6 @@ LOCAL_PATH:= $(call my-dir)
 
 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_x86 += $(LOCAL_PATH)/i387
 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_arm := -Wl,--hash-style=both
 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