about summary refs log tree commit diff
path: root/sysdeps
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 /sysdeps
parenta60eca2e55e2372e21f0d19b1dc5cac61a48ee50 (diff)
downloadglibc-5ef1b2138d4236bb3616e612c5bc4dc328a9ffb2.tar.gz
glibc-5ef1b2138d4236bb3616e612c5bc4dc328a9ffb2.tar.xz
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 'sysdeps')
-rw-r--r--sysdeps/ieee754/bits/inf.h29
1 files changed, 0 insertions, 29 deletions
diff --git a/sysdeps/ieee754/bits/inf.h b/sysdeps/ieee754/bits/inf.h
deleted file mode 100644
index eee0f2ea88..0000000000
--- a/sysdeps/ieee754/bits/inf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* `INFINITY' constant for IEEE 754 machines.
-   Copyright (C) 2004-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _MATH_H
-# error "Never use <bits/inf.h> directly; include <math.h> instead."
-#endif
-
-/* IEEE positive infinity.  */
-
-#if __GNUC_PREREQ(3,3)
-# define INFINITY	(__builtin_inff())
-#else
-# define INFINITY	HUGE_VALF
-#endif