From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id 095E13858291; Wed, 23 Nov 2022 10:54:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 095E13858291 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1669200889; bh=Cr9Fsu+iHZ6FVeQDo1wQvvycS3Ql/Hns3zZf7u/8wqE=; h=From:To:Subject:Date:From; b=sSs4woEInxHqjadkdLrrJXrC2yXsIB+vk+bKV6b+JNHPWVNrztlpsAnfC2GPvRi9f bT+2Bn9cH25Jl912wawi05vCL20BGawgbuQ54/zDBdBs+yVIWDpzUYaUCGeEAZ6jps Qc63fKawbgGtW7IjZmN6DFbkwGCUWfU2bEsLUgeE= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-4263] libstdc++: Fix libstdc++ build on some targets [PR107811] X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/master X-Git-Oldrev: 1cac00d013856fea4cee0f13c4959c8e21afd2d9 X-Git-Newrev: e6a32c12b4ef87c084d29863c79503344126d101 Message-Id: <20221123105449.095E13858291@sourceware.org> Date: Wed, 23 Nov 2022 10:54:49 +0000 (GMT) List-Id: https://gcc.gnu.org/g:e6a32c12b4ef87c084d29863c79503344126d101 commit r13-4263-ge6a32c12b4ef87c084d29863c79503344126d101 Author: Jakub Jelinek Date: Wed Nov 23 11:53:54 2022 +0100 libstdc++: Fix libstdc++ build on some targets [PR107811] 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. 2022-11-23 Jakub Jelinek 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. Diff: --- libstdc++-v3/src/c++17/floating_from_chars.cc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/src/c++17/floating_from_chars.cc b/libstdc++-v3/src/c++17/floating_from_chars.cc index be1e1051b5c..3f5d4d411d9 100644 --- a/libstdc++-v3/src/c++17/floating_from_chars.cc +++ b/libstdc++-v3/src/c++17/floating_from_chars.cc @@ -783,11 +783,16 @@ namespace using uint_t = conditional_t, uint32_t, conditional_t, uint64_t, uint16_t>>; +#if USE_LIB_FAST_FLOAT constexpr int mantissa_bits = fast_float::binary_format::mantissa_explicit_bits(); constexpr int exponent_bits = is_same_v ? 11 : is_same_v ? 5 : 8; +#else + constexpr int mantissa_bits = is_same_v ? 23 : 52; + constexpr int exponent_bits = is_same_v ? 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 +#if USE_LIB_FAST_FLOAT || is_same_v) + 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 || is_same_v) memcpy(&value, &result, sizeof(result)); +#if USE_LIB_FAST_FLOAT else if constexpr (is_same_v) { 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{}}; }