diff --git a/ChangeLog b/ChangeLog
index db05efec20..03c74fe067 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2019-06-12  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
+	* sysdeps/ieee754/dbl-64/wordsize-64/s_isinf.c: Move to ...
+	* sysdeps/ieee754/dbl-64/s_isinf.c: ... here and format code.
+
 	* sysdeps/powerpc/fpu/s_isnan.c: Remove file.
 	* sysdeps/powerpc/fpu/s_isnanf.S: Likewise.
 	* sysdeps/powerpc/powerpc32/fpu/s_isnan.S: Likewise.
diff --git a/sysdeps/ieee754/dbl-64/s_isinf.c b/sysdeps/ieee754/dbl-64/s_isinf.c
index 93eb65c147..e5300fd2a5 100644
--- a/sysdeps/ieee754/dbl-64/s_isinf.c
+++ b/sysdeps/ieee754/dbl-64/s_isinf.c
@@ -4,10 +4,6 @@
  * Public domain.
  */
 
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_isinf.c,v 1.3 1995/05/11 23:20:14 jtc Exp $";
-#endif
-
 /*
  * isinf(x) returns 1 is x is inf, -1 if x is -inf, else 0;
  * no branching!
@@ -21,11 +17,12 @@ static char rcsid[] = "$NetBSD: s_isinf.c,v 1.3 1995/05/11 23:20:14 jtc Exp $";
 int
 __isinf (double x)
 {
-  int32_t hx, lx;
-  EXTRACT_WORDS (hx, lx, x);
-  lx |= (hx & 0x7fffffff) ^ 0x7ff00000;
-  lx |= -lx;
-  return ~(lx >> 31) & (hx >> 30);
+  int64_t ix;
+  EXTRACT_WORDS64 (ix,x);
+  int64_t t = ix & UINT64_C (0x7fffffffffffffff);
+  t ^= UINT64_C (0x7ff0000000000000);
+  t |= -t;
+  return ~(t >> 63) & (ix >> 62);
 }
 hidden_def (__isinf)
 weak_alias (__isinf, isinf)
diff --git a/sysdeps/ieee754/dbl-64/wordsize-64/s_isinf.c b/sysdeps/ieee754/dbl-64/wordsize-64/s_isinf.c
deleted file mode 100644
index 2b427a8b4c..0000000000
--- a/sysdeps/ieee754/dbl-64/wordsize-64/s_isinf.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Changed to return -1 for -Inf by Ulrich Drepper <drepper@cygnus.com>.
- * Public domain.
- */
-
-/*
- * isinf(x) returns 1 is x is inf, -1 if x is -inf, else 0;
- * no branching!
- */
-
-#include <math.h>
-#include <math_private.h>
-#include <ldbl-classify-compat.h>
-#include <shlib-compat.h>
-
-int
-__isinf (double x)
-{
-	int64_t ix;
-	EXTRACT_WORDS64(ix,x);
-	int64_t t = ix & UINT64_C(0x7fffffffffffffff);
-	t ^= UINT64_C(0x7ff0000000000000);
-	t |= -t;
-	return ~(t >> 63) & (ix >> 62);
-}
-hidden_def (__isinf)
-weak_alias (__isinf, isinf)
-#ifdef NO_LONG_DOUBLE
-# if LDBL_CLASSIFY_COMPAT && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_23)
-compat_symbol (libc, __isinf, __isinfl, GLIBC_2_0);
-# endif
-weak_alias (__isinf, isinfl)
-#endif