Merge "Enable clang for x86_64 after fp128 fix in clang-2577113."
diff --git a/libc/Android.mk b/libc/Android.mk
index d94dce2..ee352eb 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -610,12 +610,6 @@
use_clang := $(USE_CLANG_PLATFORM_BUILD)
-# Clang/llvm has incompatible long double (fp128) for x86_64.
-# https://llvm.org/bugs/show_bug.cgi?id=23897
-ifeq ($(TARGET_ARCH),x86_64)
- use_clang := false
-endif
-
# b/25291096, Clang/llvm compiled libc.so for mips/mips64 failed to boot.
ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),mips mips64))
use_clang := false
diff --git a/libm/Android.mk b/libm/Android.mk
index faf3c50..ea5e72c 100644
--- a/libm/Android.mk
+++ b/libm/Android.mk
@@ -3,12 +3,6 @@
bionic_coverage := false
-# Clang/llvm has incompatible long double (fp128) for x86_64.
-# https://llvm.org/bugs/show_bug.cgi?id=23897
-ifeq ($(TARGET_ARCH),x86_64)
-libm_clang := false
-endif
-
# -----------------------------------------------------------------------------
# libm.a
# -----------------------------------------------------------------------------
diff --git a/tests/Android.mk b/tests/Android.mk
index 0db63d9..4afccac 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -137,13 +137,6 @@
libBionicStandardTests_ldlibs_host := \
-lrt \
-# Clang/llvm has incompatible long double (fp128) for x86_64.
-# https://llvm.org/bugs/show_bug.cgi?id=23897
-# This affects most of math_test.cpp.
-ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86_64))
-libBionicStandardTests_clang_target := false
-endif
-
module := libBionicStandardTests
module_tag := optional
build_type := target