diff options
| author | Elliott Hughes <enh@google.com> | 2012-06-25 14:09:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-25 14:09:42 -0700 |
| commit | 0ff08d22f02750a618821cfe25d19a5e0cb20743 (patch) | |
| tree | ee319321aafb0b358447d2a5dfa625195d4077c7 | |
| parent | 20bc061dc7a03249c90f8765ae757395587ce4f1 (diff) | |
| parent | 5af97ca8514d9fb4175bff3a79abf26889b94530 (diff) | |
| download | bionic-0ff08d22f02750a618821cfe25d19a5e0cb20743.zip bionic-0ff08d22f02750a618821cfe25d19a5e0cb20743.tar.gz bionic-0ff08d22f02750a618821cfe25d19a5e0cb20743.tar.bz2 | |
am 5af97ca8: am c7bab8cb: Merge "Enable sqrtf() x86 assembly code"
* commit '5af97ca8514d9fb4175bff3a79abf26889b94530':
Enable sqrtf() x86 assembly code
| -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 07cb7db..756c9ab 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 |