diff options
| author | Patrick Palka <ppalka@redhat.com> | 2020-12-18 11:52:14 -0500 |
|---|---|---|
| committer | Patrick Palka <ppalka@redhat.com> | 2020-12-18 11:52:14 -0500 |
| commit | 266d74647567e610cc6fd6fccb7db31081f538e2 (patch) | |
| tree | f502a772a75789d68644d0f0c62f5867a4bf6ef4 /libstdc++-v3/src | |
| parent | 3af02d32cce2ff1ff11d078cf8094305f57ca179 (diff) | |
| download | gcc-266d74647567e610cc6fd6fccb7db31081f538e2.zip gcc-266d74647567e610cc6fd6fccb7db31081f538e2.tar.gz gcc-266d74647567e610cc6fd6fccb7db31081f538e2.tar.bz2 | |
libstdc++: Check FE_TONEAREST is defined before using it
We need to test that FE_TONEAREST is defined before we may use it along
with fegetround/fesetround to adjust the floating-point rounding mode.
This fixes a build failure with older versions of newlib.
libstdc++-v3/ChangeLog:
* src/c++17/floating_from_chars.cc (from_chars_impl)
[!defined(FE_TONEAREST)]: Don't adjust the rounding mode.
* src/c++17/floating_to_chars.cc (__floating_to_chars_precision):
Likewise.
Diffstat (limited to 'libstdc++-v3/src')
| -rw-r--r-- | libstdc++-v3/src/c++17/floating_from_chars.cc | 4 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++17/floating_to_chars.cc | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libstdc++-v3/src/c++17/floating_from_chars.cc b/libstdc++-v3/src/c++17/floating_from_chars.cc index a194335..86d6d06 100644 --- a/libstdc++-v3/src/c++17/floating_from_chars.cc +++ b/libstdc++-v3/src/c++17/floating_from_chars.cc @@ -307,7 +307,7 @@ namespace { locale_t orig = ::uselocale(loc); -#if _GLIBCXX_USE_C99_FENV_TR1 +#if _GLIBCXX_USE_C99_FENV_TR1 && defined(FE_TONEAREST) const int rounding = std::fegetround(); if (rounding != FE_TONEAREST) std::fesetround(FE_TONEAREST); @@ -333,7 +333,7 @@ namespace #endif const int conv_errno = std::__exchange(errno, save_errno); -#if _GLIBCXX_USE_C99_FENV_TR1 +#if _GLIBCXX_USE_C99_FENV_TR1 && defined(FE_TONEAREST) if (rounding != FE_TONEAREST) std::fesetround(rounding); #endif diff --git a/libstdc++-v3/src/c++17/floating_to_chars.cc b/libstdc++-v3/src/c++17/floating_to_chars.cc index dd83f5e..474e791 100644 --- a/libstdc++-v3/src/c++17/floating_to_chars.cc +++ b/libstdc++-v3/src/c++17/floating_to_chars.cc @@ -946,13 +946,13 @@ template<typename T> // digit, and carefully compute and write the last digit // ourselves. char buffer[expected_output_length+1]; -#if _GLIBCXX_USE_C99_FENV_TR1 +#if _GLIBCXX_USE_C99_FENV_TR1 && defined(FE_TONEAREST) const int saved_rounding_mode = fegetround(); if (saved_rounding_mode != FE_TONEAREST) fesetround(FE_TONEAREST); // We want round-to-nearest behavior. #endif const int output_length = sprintf(buffer, "%.0Lf", value); -#if _GLIBCXX_USE_C99_FENV_TR1 +#if _GLIBCXX_USE_C99_FENV_TR1 && defined(FE_TONEAREST) if (saved_rounding_mode != FE_TONEAREST) fesetround(saved_rounding_mode); #endif @@ -1139,14 +1139,14 @@ template<typename T> // Do the sprintf into the local buffer. char buffer[output_length_upper_bound+1]; -#if _GLIBCXX_USE_C99_FENV_TR1 +#if _GLIBCXX_USE_C99_FENV_TR1 && defined(FE_TONEAREST) const int saved_rounding_mode = fegetround(); if (saved_rounding_mode != FE_TONEAREST) fesetround(FE_TONEAREST); // We want round-to-nearest behavior. #endif int output_length = sprintf(buffer, output_specifier, effective_precision, value); -#if _GLIBCXX_USE_C99_FENV_TR1 +#if _GLIBCXX_USE_C99_FENV_TR1 && defined(FE_TONEAREST) if (saved_rounding_mode != FE_TONEAREST) fesetround(saved_rounding_mode); #endif |