From: Patrick Palka <ppalka@redhat.com>
Date: Fri, 18 Dec 2020 16:52:14 +0000 (-0500)
Subject: libstdc++: Check FE_TONEAREST is defined before using it
X-Git-Tag: upstream/12.2.0~10696
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=266d74647567e610cc6fd6fccb7db31081f538e2;p=platform%2Fupstream%2Fgcc.git

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 --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