aboutsummaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2017-08-31 16:12:46 +0000
committerJoseph Myers <joseph@codesourcery.com>2017-08-31 16:12:46 +0000
commit5ef1b2138d4236bb3616e612c5bc4dc328a9ffb2 (patch)
tree61aafc452df09633ca89bf87e3757507d4fc99a3 /math
parenta60eca2e55e2372e21f0d19b1dc5cac61a48ee50 (diff)
downloadglibc-5ef1b2138d4236bb3616e612c5bc4dc328a9ffb2.tar
glibc-5ef1b2138d4236bb3616e612c5bc4dc328a9ffb2.tar.gz
glibc-5ef1b2138d4236bb3616e612c5bc4dc328a9ffb2.tar.bz2
glibc-5ef1b2138d4236bb3616e612c5bc4dc328a9ffb2.zip
Simplify INFINITY definitions.
Similar to my patch for HUGE_VAL, this patch eliminates the bits/inf.h headers and just unconditionally uses the same definitions as the sysdeps/ieee754 version did (__builtin_inff () for GCC >= 3.3, otherwise HUGE_VALF), directly in math.h, so removing an unnecessary level of indirection. Tested for x86_64. * math/math.h [__USE_ISOC99] (INFINITY): Define directly here. Do not include <bits/inf.h>. * math/Makefile (headers): Remove bits/inf.h. * bits/inf.h: Remove. * sysdeps/ieee754/bits/inf.h: Likewise.
Diffstat (limited to 'math')
-rw-r--r--math/Makefile2
-rw-r--r--math/math.h8
2 files changed, 7 insertions, 3 deletions
diff --git a/math/Makefile b/math/Makefile
index 01345fb775..b9a06f0ca0 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -23,7 +23,7 @@ include ../Makeconfig
# Installed header files.
headers := math.h bits/mathcalls.h bits/mathinline.h \
- bits/inf.h bits/nan.h \
+ bits/nan.h \
fpu_control.h complex.h bits/cmathcalls.h fenv.h \
bits/fenv.h bits/fenvinline.h bits/mathdef.h tgmath.h \
bits/math-finite.h bits/math-vector.h \
diff --git a/math/math.h b/math/math.h
index dcccf8ea8c..5f5a498b11 100644
--- a/math/math.h
+++ b/math/math.h
@@ -58,8 +58,12 @@ __BEGIN_DECLS
#endif
#ifdef __USE_ISOC99
-/* Get machine-dependent INFINITY value. */
-# include <bits/inf.h>
+/* IEEE positive infinity. */
+# if __GNUC_PREREQ (3, 3)
+# define INFINITY (__builtin_inff ())
+# else
+# define INFINITY HUGE_VALF
+# endif
/* Get machine-dependent NAN value (returned for some domain errors). */
# include <bits/nan.h>