am c7bab8cb: Merge "Enable sqrtf() x86 assembly code"

* commit 'c7bab8cb8483e7869eabdbd4add7c9e5beeecc80':
  Enable sqrtf() x86 assembly code
This commit is contained in:
Elliott Hughes 2012-06-25 14:06:06 -07:00 committed by Android Git Automerger
commit 5af97ca851

View File

@ -54,7 +54,6 @@ libm_common_src_files:= \
src/e_sinh.c \ src/e_sinh.c \
src/e_sinhf.c \ src/e_sinhf.c \
src/e_sqrt.c \ src/e_sqrt.c \
src/e_sqrtf.c \
src/k_cos.c \ src/k_cos.c \
src/k_cosf.c \ src/k_cosf.c \
src/k_rem_pio2.c \ src/k_rem_pio2.c \
@ -160,7 +159,8 @@ ifeq ($(TARGET_ARCH),arm)
src/e_ldexpf.c \ src/e_ldexpf.c \
src/s_scalbln.c \ src/s_scalbln.c \
src/s_scalbn.c \ src/s_scalbn.c \
src/s_scalbnf.c src/s_scalbnf.c \
src/e_sqrtf.c
libm_common_includes = $(LOCAL_PATH)/arm libm_common_includes = $(LOCAL_PATH)/arm
endif endif
@ -170,7 +170,8 @@ ifeq ($(TARGET_OS)-$(TARGET_ARCH),linux-x86)
i387/fenv.c \ i387/fenv.c \
i387/s_scalbnl.S \ i387/s_scalbnl.S \
i387/s_scalbn.S \ i387/s_scalbn.S \
i387/s_scalbnf.S i387/s_scalbnf.S \
i387/e_sqrtf.S
libm_common_includes = $(LOCAL_PATH)/i386 $(LOCAL_PATH)/i387 libm_common_includes = $(LOCAL_PATH)/i386 $(LOCAL_PATH)/i387
endif endif
@ -180,7 +181,8 @@ ifeq ($(TARGET_ARCH),mips)
src/e_ldexpf.c \ src/e_ldexpf.c \
src/s_scalbln.c \ src/s_scalbln.c \
src/s_scalbn.c \ src/s_scalbn.c \
src/s_scalbnf.c src/s_scalbnf.c \
src/e_sqrtf.c
libm_common_includes = $(LOCAL_PATH)/mips libm_common_includes = $(LOCAL_PATH)/mips
# Need to build *rint* functions # Need to build *rint* functions