From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7857) id B5F673858417; Mon, 17 Jan 2022 10:27:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B5F673858417 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Matthias Kretz To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-6628] libstdc++: Don't fail if math_errhandling is not defined X-Act-Checkin: gcc X-Git-Author: Matthias Kretz X-Git-Refname: refs/heads/master X-Git-Oldrev: 57cfcb3eb280421d7e2c97fca3ab372e50d19545 X-Git-Newrev: 84eb13b9d6a9979825f5deaa1c17762bf8c8ef9f Message-Id: <20220117102742.B5F673858417@sourceware.org> Date: Mon, 17 Jan 2022 10:27:42 +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: Mon, 17 Jan 2022 10:27:42 -0000 https://gcc.gnu.org/g:84eb13b9d6a9979825f5deaa1c17762bf8c8ef9f commit r12-6628-g84eb13b9d6a9979825f5deaa1c17762bf8c8ef9f Author: Matthias Kretz Date: Mon Jan 17 10:38:29 2022 +0100 libstdc++: Don't fail if math_errhandling is not defined Older glibc does not define math_errhandling with -ffast-math, in which case floating-point exceptions are not used. Signed-off-by: Matthias Kretz libstdc++-v3/ChangeLog: * include/experimental/bits/simd.h (__floating_point_flags): Do not rely on the presence of the math_errhandling macro. Diff: --- libstdc++-v3/include/experimental/bits/simd.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/experimental/bits/simd.h b/libstdc++-v3/include/experimental/bits/simd.h index d837d0efb21..c991e3f223e 100644 --- a/libstdc++-v3/include/experimental/bits/simd.h +++ b/libstdc++-v3/include/experimental/bits/simd.h @@ -283,11 +283,20 @@ constexpr inline bool __have_power_vmx = __have_power_vsx; namespace __detail { + constexpr bool __handle_fpexcept = +#ifdef math_errhandling + math_errhandling & MATH_ERREXCEPT; +#elif defined __FAST_MATH__ + false; +#else + true; +#endif + constexpr std::uint_least64_t __floating_point_flags() { std::uint_least64_t __flags = 0; - if constexpr (math_errhandling & MATH_ERREXCEPT) + if constexpr (__handle_fpexcept) __flags |= 1; #ifdef __FAST_MATH__ __flags |= 1 << 1;