diff mbox series

[committed] libstdc++; Do not use strtold for hppa-hpux [PR110653]

Message ID 20230724200510.83085-1-jwakely@redhat.com
State Unresolved
Headers
Series [committed] libstdc++; Do not use strtold for hppa-hpux [PR110653] |

Checks

Context Check Description
snail/gcc-patch-check warning Git am fail log

Commit Message

Jonathan Wakely July 24, 2023, 8:04 p.m. UTC 
  Tested x86_64-linux, pushed to trunk.

I hope this bug can be closed now, ut will have to wait for Dave Angling
to post results.

-- >8 --

When I switched std::stold to depend on HAVE_STRTOLD that enabled it for
hppa-hpux which defines HAVE_BROKEN_STRTOLD. Add a check for that macro
so that we don't use strtold, and fall through to the check for double
and long double having the same representation. That should mean we
define a conforming std::stold in terms of std::stod, instead of trying
to use the broken strtold.

Also fix a logic error in the fallback definition of std::stod, which
should not treat zero as a subnormal number.

libstdc++-v3/ChangeLog:

	PR libstdc++/110653
	* include/bits/basic_string.h [!HAVE_STOF] (stof): Do not
	throw an exception for zero result.
	[HAVE_BROKEN_STRTOLD] (stold): Do not use strtold.
---
 libstdc++-v3/include/bits/basic_string.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h
index e4cb9846025..170a43664c9 100644
--- a/libstdc++-v3/include/bits/basic_string.h
+++ b/libstdc++-v3/include/bits/basic_string.h
@@ -4148,7 +4148,7 @@  _GLIBCXX_BEGIN_NAMESPACE_CXX11
   stod(const string& __str, size_t* __idx = 0)
   { return __gnu_cxx::__stoa(&std::strtod, "stod", __str.c_str(), __idx); }
 
-#if _GLIBCXX_USE_C99_STDLIB || _GLIBCXX_HAVE_STRTOF
+#if _GLIBCXX_HAVE_STRTOF
   // NB: strtof vs strtod.
   inline float
   stof(const string& __str, size_t* __idx = 0)
@@ -4158,7 +4158,7 @@  _GLIBCXX_BEGIN_NAMESPACE_CXX11
   stof(const string& __str, size_t* __idx = 0)
   {
     double __d = std::stod(__str, __idx);
-    if (__builtin_isfinite(__d))
+    if (__builtin_isfinite(__d) && __d != 0.0)
       {
 	double __abs_d = __builtin_fabs(__d);
 	if (__abs_d < __FLT_MIN__ || __abs_d > __FLT_MAX__)
@@ -4171,7 +4171,7 @@  _GLIBCXX_BEGIN_NAMESPACE_CXX11
   }
 #endif
 
-#if _GLIBCXX_USE_C99_STDLIB || _GLIBCXX_HAVE_STRTOLD
+#if _GLIBCXX_HAVE_STRTOLD && ! _GLIBCXX_HAVE_BROKEN_STRTOLD
   inline long double
   stold(const string& __str, size_t* __idx = 0)
   { return __gnu_cxx::__stoa(&std::strtold, "stold", __str.c_str(), __idx); }