From: Jakub Jelinek <jakub@redhat.com>
To: Jonathan Wakely <jwakely@redhat.com>
Cc: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: [PATCH] libstdc++: Fix libstdc++ build on some targets [PR107811]
Date: Wed, 23 Nov 2022 09:55:00 +0100 [thread overview]
Message-ID: <Y33f5EQ0InVdAs3/@tucnak> (raw)
Hi!
fast_float library relies on size_t being 32-bit or larger and float/double
being IEEE single/double. Otherwise we only use strtod/strtof.
In 3 spots I've used fast_float namespace stuff unconditionally in one
function, which breaks the build if fast_float is disabled.
Fixed thusly, bootstrapped/regtested on x86_64-linux and i686-linux, ok for
trunk?
2022-11-23 Jakub Jelinek <jakub@redhat.com>
PR libstdc++/107811
* src/c++17/floating_from_chars.cc (__floating_from_chars_hex): Guard
fast_float uses with #if USE_LIB_FAST_FLOAT and for mantissa_bits and
exponent_bits provide a fallback.
--- libstdc++-v3/src/c++17/floating_from_chars.cc.jj 2022-11-08 09:54:37.533397224 +0100
+++ libstdc++-v3/src/c++17/floating_from_chars.cc 2022-11-22 14:03:10.365474110 +0100
@@ -783,11 +783,16 @@ namespace
using uint_t = conditional_t<is_same_v<T, float>, uint32_t,
conditional_t<is_same_v<T, double>, uint64_t,
uint16_t>>;
+#if USE_LIB_FAST_FLOAT
constexpr int mantissa_bits
= fast_float::binary_format<T>::mantissa_explicit_bits();
constexpr int exponent_bits
= is_same_v<T, double> ? 11
: is_same_v<T, fast_float::floating_type_float16_t> ? 5 : 8;
+#else
+ constexpr int mantissa_bits = is_same_v<T, float> ? 23 : 52;
+ constexpr int exponent_bits = is_same_v<T, float> ? 8 : 11;
+#endif
constexpr int exponent_bias = (1 << (exponent_bits - 1)) - 1;
__glibcxx_requires_valid_range(first, last);
@@ -945,8 +950,11 @@ namespace
else if (mantissa_idx >= -4)
{
if constexpr (is_same_v<T, float>
+#if USE_LIB_FAST_FLOAT
|| is_same_v<T,
- fast_float::floating_type_bfloat16_t>)
+ fast_float::floating_type_bfloat16_t>
+#endif
+ )
{
__glibcxx_assert(mantissa_idx == -1);
mantissa |= hexit >> 1;
@@ -1130,6 +1138,7 @@ namespace
}
if constexpr (is_same_v<T, float> || is_same_v<T, double>)
memcpy(&value, &result, sizeof(result));
+#if USE_LIB_FAST_FLOAT
else if constexpr (is_same_v<T, fast_float::floating_type_bfloat16_t>)
{
uint32_t res = uint32_t{result} << 16;
@@ -1156,6 +1165,7 @@ namespace
| ((uint32_t{result} & 0x8000) << 16));
memcpy(value.x, &res, sizeof(res));
}
+#endif
return {first, errc{}};
}
Jakub
next reply other threads:[~2022-11-23 8:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-23 8:55 Jakub Jelinek [this message]
2022-11-23 9:19 ` Jonathan Wakely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y33f5EQ0InVdAs3/@tucnak \
--to=jakub@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=jwakely@redhat.com \
--cc=libstdc++@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).