generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Always build libm with clang."

Browse Source
This commit is contained in:
Elliott Hughes 2015-06-11 16:58:22 +00:00 committed by Gerrit Code Review
commit 9ef26a3c4c
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libm/Android.mk
View File

@ -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