From bd98471eb2e242a0e5507e325e52ca998cf77865 Mon Sep 17 00:00:00 2001 From: "Paul E. Murphy" Date: Mon, 16 Mar 2020 10:49:04 -0500 Subject: ldbl-128ibm: simplify iscanonical.h The test for enabling _Float128 or IEEE 128 long double can be greatly simplified knowing that there is no ibm128, thus we require no special cases, and everything is canonical. This reverts the changes to ldbl-128ibm iscanonical.h from commit 8dbfea3a2094798a52cebddde01d255483f49665 and extends the check for __NO_LONG_DOUBLE_MATH to include a check for float128 redirects to long double. Reviewed-by: Tulio Magno Quites Machado Filho --- sysdeps/ieee754/ldbl-128ibm/bits/iscanonical.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'sysdeps/ieee754/ldbl-128ibm/bits') diff --git a/sysdeps/ieee754/ldbl-128ibm/bits/iscanonical.h b/sysdeps/ieee754/ldbl-128ibm/bits/iscanonical.h index 70da85f2cb..b2021b5d64 100644 --- a/sysdeps/ieee754/ldbl-128ibm/bits/iscanonical.h +++ b/sysdeps/ieee754/ldbl-128ibm/bits/iscanonical.h @@ -20,15 +20,11 @@ # error "Never use directly; include instead." #endif -#ifdef __NO_LONG_DOUBLE_MATH +#if defined (__NO_LONG_DOUBLE_MATH) || __LONG_DOUBLE_USES_FLOAT128 == 1 # define iscanonical(x) ((void) (__typeof (x)) (x), 1) #else -# if __LONG_DOUBLE_USES_FLOAT128 == 1 -# define __iscanonicall(x) ((void) (__typeof (x)) (x), 1) -# else extern int __iscanonicall (long double __x) __THROW __attribute__ ((__const__)); -# endif # define __iscanonicalf(x) ((void) (__typeof (x)) (x), 1) # define __iscanonical(x) ((void) (__typeof (x)) (x), 1) # if __HAVE_DISTINCT_FLOAT128 @@ -54,9 +50,7 @@ extern "C++" { inline int iscanonical (float __val) { return __iscanonicalf (__val); } inline int iscanonical (double __val) { return __iscanonical (__val); } inline int iscanonical (long double __val) { return __iscanonicall (__val); } -/* When using an IEEE 128-bit long double, _Float128 is defined as long double - in C++. */ -# if __HAVE_DISTINCT_FLOAT128 && __HAVE_FLOAT128_UNLIKE_LDBL +# if __HAVE_DISTINCT_FLOAT128 inline int iscanonical (_Float128 __val) { return __iscanonicalf128 (__val); } # endif } -- cgit 1.4.1