Revert "Update to FreeBSD libm r336523."
This reverts commit f86ee10278116d211cfb08679416444e0e714cb5.
Incorrect result for fmodf(3.0f, 0f) = 1.0f breaks ART tests.
Bug: 111710419
Test: art/test/testrunner/testrunner.py -b -t 436-rem-float --target
Change-Id: I7eae68fb92740db33415d16418447bcbbd98ecba
diff --git a/libm/Android.bp b/libm/Android.bp
index 0e3bdf7..9566d5f 100644
--- a/libm/Android.bp
+++ b/libm/Android.bp
@@ -92,8 +92,6 @@
"upstream-freebsd/lib/msun/src/s_cimag.c",
"upstream-freebsd/lib/msun/src/s_cimagf.c",
"upstream-freebsd/lib/msun/src/s_cimagl.c",
- "upstream-freebsd/lib/msun/src/s_clog.c",
- "upstream-freebsd/lib/msun/src/s_clogf.c",
"upstream-freebsd/lib/msun/src/s_conj.c",
"upstream-freebsd/lib/msun/src/s_conjf.c",
"upstream-freebsd/lib/msun/src/s_conjl.c",
@@ -101,9 +99,6 @@
"upstream-freebsd/lib/msun/src/s_copysignf.c",
"upstream-freebsd/lib/msun/src/s_cos.c",
"upstream-freebsd/lib/msun/src/s_cosf.c",
- "upstream-freebsd/lib/msun/src/s_cpow.c",
- "upstream-freebsd/lib/msun/src/s_cpowf.c",
- "upstream-freebsd/lib/msun/src/s_cpowl.c",
"upstream-freebsd/lib/msun/src/s_cproj.c",
"upstream-freebsd/lib/msun/src/s_cprojf.c",
"upstream-freebsd/lib/msun/src/s_cprojl.c",
@@ -191,6 +186,12 @@
"upstream-netbsd/lib/libm/complex/ccosl.c",
"upstream-netbsd/lib/libm/complex/cephes_subrl.c",
"upstream-netbsd/lib/libm/complex/cexpl.c",
+ "upstream-netbsd/lib/libm/complex/clog.c",
+ "upstream-netbsd/lib/libm/complex/clogf.c",
+ "upstream-netbsd/lib/libm/complex/clogl.c",
+ "upstream-netbsd/lib/libm/complex/cpow.c",
+ "upstream-netbsd/lib/libm/complex/cpowf.c",
+ "upstream-netbsd/lib/libm/complex/cpowl.c",
"upstream-netbsd/lib/libm/complex/csinhl.c",
"upstream-netbsd/lib/libm/complex/csinl.c",
"upstream-netbsd/lib/libm/complex/ctanhl.c",
@@ -228,7 +229,6 @@
"upstream-freebsd/lib/msun/src/s_atanl.c",
"upstream-freebsd/lib/msun/src/s_cbrtl.c",
"upstream-freebsd/lib/msun/src/s_ceill.c",
- "upstream-freebsd/lib/msun/src/s_clogl.c",
"upstream-freebsd/lib/msun/src/s_copysignl.c",
"upstream-freebsd/lib/msun/src/e_coshl.c",
"upstream-freebsd/lib/msun/src/s_cosl.c",
@@ -261,7 +261,6 @@
"upstream-freebsd/lib/msun/ld128/invtrig.c",
"upstream-freebsd/lib/msun/ld128/e_lgammal_r.c",
- "upstream-freebsd/lib/msun/ld128/e_powl.c",
"upstream-freebsd/lib/msun/ld128/k_cosl.c",
"upstream-freebsd/lib/msun/ld128/k_sinl.c",
"upstream-freebsd/lib/msun/ld128/k_tanl.c",