am eb15a6c9: Merge "We actually have modfl."

* commit 'eb15a6c9cd35fa2a91d277c48390827a78435ab4':
  We actually have modfl.
This commit is contained in:
Elliott Hughes 2013-12-19 11:42:05 -08:00 committed by Android Git Automerger
commit 53fc123c69
2 changed files with 3 additions and 3 deletions

View File

@ -177,7 +177,9 @@ libm_common_src_files += \
upstream-freebsd/lib/msun/src/w_drem.c \ upstream-freebsd/lib/msun/src/w_drem.c \
upstream-freebsd/lib/msun/src/w_dremf.c \ upstream-freebsd/lib/msun/src/w_dremf.c \
libm_common_src_files += fake_long_double.c libm_common_src_files += \
fake_long_double.c \
upstream-freebsd/lib/msun/src/s_modfl.c \
# TODO: on Android, "long double" is "double". # TODO: on Android, "long double" is "double".
# upstream-freebsd/lib/msun/src/e_acosl.c \ # upstream-freebsd/lib/msun/src/e_acosl.c \
@ -204,7 +206,6 @@ libm_common_src_files += fake_long_double.c
# upstream-freebsd/lib/msun/src/s_logbl.c \ # upstream-freebsd/lib/msun/src/s_logbl.c \
# upstream-freebsd/lib/msun/src/s_lrintl.c \ # upstream-freebsd/lib/msun/src/s_lrintl.c \
# upstream-freebsd/lib/msun/src/s_lroundl.c \ # upstream-freebsd/lib/msun/src/s_lroundl.c \
# upstream-freebsd/lib/msun/src/s_modfl.c \
# upstream-freebsd/lib/msun/src/s_nextafterl.c \ # upstream-freebsd/lib/msun/src/s_nextafterl.c \
# upstream-freebsd/lib/msun/src/s_nexttoward.c \ # upstream-freebsd/lib/msun/src/s_nexttoward.c \
# upstream-freebsd/lib/msun/src/s_remquol.c \ # upstream-freebsd/lib/msun/src/s_remquol.c \

View File

@ -72,7 +72,6 @@ long double logl(long double a1) { return log(a1); }
long lrintl(long double a1) { return lrint(a1); } long lrintl(long double a1) { return lrint(a1); }
long long llroundl(long double a1) { return llround(a1); } long long llroundl(long double a1) { return llround(a1); }
long lroundl(long double a1) { return lround(a1); } long lroundl(long double a1) { return lround(a1); }
long double modfl(long double a1, long double* a2) { return modf(a1, (double*) a2); }
long double nanl(const char* a1) { return nan(a1); } long double nanl(const char* a1) { return nan(a1); }
long double nextafterl(long double a1, long double a2) { return nextafter(a1, a2); } long double nextafterl(long double a1, long double a2) { return nextafter(a1, a2); }
long double powl(long double a1, long double a2) { return pow(a1, a2); } long double powl(long double a1, long double a2) { return pow(a1, a2); }