diff options
| author | Elliott Hughes <enh@google.com> | 2018-09-05 22:29:28 +0000 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2018-09-05 22:29:28 +0000 |
| commit | b75cc027ffd2fdbb26e63c4eba326bff8c2d1519 (patch) | |
| tree | 9a6cd673b08f257ac7191aa20c80e604364c8743 /libm | |
| parent | 35d8ba303b3b21f25ce66d8602ed36672145de3f (diff) | |
Revert "arm64: Use builtin for nearbyintf/nearbyint"
This reverts commit 35d8ba303b3b21f25ce66d8602ed36672145de3f.
Reason for revert: caused test failures...
[ FAILED ] math_h_force_long_double.nearbyint (15 ms)
bionic/tests/math_test.cpp:(1080) Failure in test math_h_force_long_double.nearbyint
Value of: (fetestexcept(FE_ALL_EXCEPT) & FE_INEXACT) == 0
Actual: false
Expected: true
math_h_force_long_double.nearbyint exited with exitcode 1.
Change-Id: If8e3a3dfbd0e7ee071e5187f96749b6acbb5fc05
Diffstat (limited to 'libm')
| -rw-r--r-- | libm/Android.bp | 2 | ||||
| -rw-r--r-- | libm/builtins.cpp | 8 |
2 files changed, 0 insertions, 10 deletions
diff --git a/libm/Android.bp b/libm/Android.bp index c0862c807..3b88fa3a8 100644 --- a/libm/Android.bp +++ b/libm/Android.bp @@ -315,8 +315,6 @@ cc_library { "upstream-freebsd/lib/msun/src/s_llrintf.c", "upstream-freebsd/lib/msun/src/s_lrint.c", "upstream-freebsd/lib/msun/src/s_lrintf.c", - "upstream-freebsd/lib/msun/src/s_nearbyintf.c", - "upstream-freebsd/lib/msun/src/s_nearbyint.c", "upstream-freebsd/lib/msun/src/s_rint.c", "upstream-freebsd/lib/msun/src/s_rintf.c", "upstream-freebsd/lib/msun/src/s_round.c", diff --git a/libm/builtins.cpp b/libm/builtins.cpp index 515b68a80..2ea63055c 100644 --- a/libm/builtins.cpp +++ b/libm/builtins.cpp @@ -57,12 +57,4 @@ double fmin(double x, double y) { return __builtin_fmin(x, y); } float roundf(float x) { return __builtin_roundf(x); } double round(double x) { return __builtin_round(x); } - -float nearbyintf(float x) { return __builtin_nearbyintf(x); } -double nearbyint(double x) { return __builtin_nearbyint(x); } -// msun s_nearbyint.c defines all floating-point version, so we need to -// redefine the long double one here. For aarch64, clang/compiler-rt -// soft-float routines does not use single/double floating-point operation, -// so it should be safe to call rintl directly. -long double nearbyintl(long double x) { return rintl(x); } #endif |