diff options
| author | Elliott Hughes <enh@google.com> | 2012-06-25 10:46:41 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-06-25 10:46:41 -0700 |
| commit | c7bab8cb8483e7869eabdbd4add7c9e5beeecc80 (patch) | |
| tree | 5cd316fe35b52f637fb7a433e43c27901ab75998 | |
| parent | a5948157fd34acb2b1d1bfaf129901af865ab5fc (diff) | |
| parent | 29aa0099248b3a7ac4e178e15bdcb2edbce2500a (diff) | |
| download | bionic-ics-plus-aosp.tar.gz | |
Merge "Enable sqrtf() x86 assembly code"ics-plus-aosp
| -rw-r--r-- | libm/Android.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libm/Android.mk b/libm/Android.mk index 07cb7dbe9..756c9ab89 100644 --- a/libm/Android.mk +++ b/libm/Android.mk @@ -54,7 +54,6 @@ libm_common_src_files:= \ src/e_sinh.c \ src/e_sinhf.c \ src/e_sqrt.c \ - src/e_sqrtf.c \ src/k_cos.c \ src/k_cosf.c \ src/k_rem_pio2.c \ @@ -160,7 +159,8 @@ ifeq ($(TARGET_ARCH),arm) src/e_ldexpf.c \ src/s_scalbln.c \ src/s_scalbn.c \ - src/s_scalbnf.c + src/s_scalbnf.c \ + src/e_sqrtf.c libm_common_includes = $(LOCAL_PATH)/arm endif @@ -170,7 +170,8 @@ ifeq ($(TARGET_OS)-$(TARGET_ARCH),linux-x86) i387/fenv.c \ i387/s_scalbnl.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 endif @@ -180,7 +181,8 @@ ifeq ($(TARGET_ARCH),mips) src/e_ldexpf.c \ src/s_scalbln.c \ src/s_scalbn.c \ - src/s_scalbnf.c + src/s_scalbnf.c \ + src/e_sqrtf.c libm_common_includes = $(LOCAL_PATH)/mips # Need to build *rint* functions |