From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 0C9DC38618B2; Fri, 18 Dec 2020 16:55:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0C9DC38618B2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Patrick Palka To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-6258] libstdc++: Check FE_TONEAREST is defined before using it X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/master X-Git-Oldrev: 3af02d32cce2ff1ff11d078cf8094305f57ca179 X-Git-Newrev: 266d74647567e610cc6fd6fccb7db31081f538e2 Message-Id: <20201218165516.0C9DC38618B2@sourceware.org> Date: Fri, 18 Dec 2020 16:55:16 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Dec 2020 16:55:16 -0000 https://gcc.gnu.org/g:266d74647567e610cc6fd6fccb7db31081f538e2 commit r11-6258-g266d74647567e610cc6fd6fccb7db31081f538e2 Author: Patrick Palka Date: Fri Dec 18 11:52:14 2020 -0500 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. Diff: --- libstdc++-v3/src/c++17/floating_from_chars.cc | 4 ++-- 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 a1943351493..86d6d0645a9 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 dd83f5eea93..474e791e717 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 // 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 // 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