about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/ieee754/ldbl-128ibm/bits/iscanonical.h6
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 86f4557abc..c61990d521 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-09-30  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/ieee754/ldbl-128ibm/bits/iscanonical.h
+	[__NO_LONG_DOUBLE_MATH] (__iscanonicall): Do not declare.
+	[__NO_LONG_DOUBLE_MATH] (iscanonical): Define to evaluate to 1.
+
 2016-09-30  Carlos O'Donell  <carlos@redhat.com>
 
 	[BZ #20292]
diff --git a/sysdeps/ieee754/ldbl-128ibm/bits/iscanonical.h b/sysdeps/ieee754/ldbl-128ibm/bits/iscanonical.h
index cbc79ae8da..c7b7c63f95 100644
--- a/sysdeps/ieee754/ldbl-128ibm/bits/iscanonical.h
+++ b/sysdeps/ieee754/ldbl-128ibm/bits/iscanonical.h
@@ -20,6 +20,9 @@
 # error "Never use <bits/iscanonical.h> directly; include <math.h> instead."
 #endif
 
+#ifdef __NO_LONG_DOUBLE_MATH
+# define iscanonical(x) ((void) (__typeof (x)) (x), 1)
+#else
 extern int __iscanonicall (long double __x)
      __THROW __attribute__ ((__const__));
 
@@ -29,7 +32,8 @@ extern int __iscanonicall (long double __x)
    conversion, before being discarded; in IBM long double, there are
    encodings that are not consistently handled as corresponding to any
    particular value of the type, and we return 0 for those.  */
-#define iscanonical(x)				\
+# define iscanonical(x)				\
   (sizeof (x) == sizeof (long double)		\
    ? __iscanonicall (x)				\
    : ((void) (__typeof (x)) (x), 1))
+#endif