1 files changed, 10 insertions, 29 deletions
diff --git a/newlib/libm/common/s_infconst.c b/newlib/libm/common/s_infconst.c
index 9447b97cc..47a9dca19 100644
--- a/newlib/libm/common/s_infconst.c
+++ b/newlib/libm/common/s_infconst.c
@@ -3,38 +3,19 @@
  */
 
 #include <float.h>
-#include "fdlibm.h"
+#include <math.h>
 
+/* These should never actually be used any longer, as their use in math.h was
+ * removed, but they are kept here in case a user was pointing to them.
+ * FIXME:  deprecate these identifiers and then delete them.  */
+ 
 /* Float version of infinity.  */
-const union __fmath __infinityf[1] = {{{0x7f800000}}};
+const union __fmath __infinityf[1] = { { FLT_MAX+FLT_MAX } };
 
 /* Double version of infinity.  */
-#ifndef _DOUBLE_IS_32BITS
- #ifdef __IEEE_BIG_ENDIAN
-  const union __dmath __infinity[1] = {{{0x7ff00000, 0}}};
- #else
-  const union __dmath __infinity[1] = {{{0, 0x7ff00000}}};
- #endif
-#else /* defined (_DOUBLE_IS_32BITS) */
- const union __dmath __infinity[1] = {{{0x7f800000, 0}}};
-#endif /* defined (_DOUBLE_IS_32BITS) */
+const union __dmath __infinity[1] = { { DBL_MAX+DBL_MAX } };
 
 /* Long double version of infinity.  */
-#ifdef __IEEE_BIG_ENDIAN
- #if LDBL_MANT_DIG == 24
-  const union __ldmath __infinityld[1] = {{{0x7f800000, 0, 0, 0}}};
- #elif LDBL_MANT_DIG == 53
-  const union __ldmath __infinityld[1] = {{{0x7ff00000, 0, 0, 0}}};
- #else
-  const union __ldmath __infinityld[1] = {{{0x7fff0000, 0, 0, 0}}};
- #endif /* LDBL_MANT_DIG size  */
-#else /* __IEEE_LITTLE_ENDIAN  */
- #if LDBL_MANT_DIG == 24
-  const union __ldmath __infinityld[1] = {{{0x7f800000, 0, 0, 0}}};
- #elif LDBL_MANT_DIG == 53
-  const union __ldmath __infinityld[1] = {{{0, 0x7ff00000, 0, 0}}};
- #else
-  const union __ldmath __infinityld[1] = {{{0, 0x80000000, 0x00007fff, 0}}};
- #endif /* LDBL_MANT_DIG size  */
-#endif /* __IEEE_LITTLE_ENDIAN  */
-
+#if defined(_HAVE_LONG_DOUBLE)
+const union __ldmath __infinityld[1] = { { LDBL_MAX+LDBL_MAX } };
+#endif