diff --git a/ChangeLog b/ChangeLog
index 7ec115f588..d1aff069da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2018-09-11  Joseph Myers  <joseph@codesourcery.com>
 
+	* sysdeps/x86_64/fpu/math_private.h (MOVD): Remove macro.
+	(MOVQ): Likewise.
+	(EXTRACT_WORDS64): Likewise.
+	(INSERT_WORDS64): Likewise.
+	(GET_FLOAT_WORD): Likewise.
+	(SET_FLOAT_WORD): Likewise.
+
 	* scripts/build-many-glibcs.py (Context.__init__): Add full_gcc
 	argument.
 	(Config.build_gcc): Use --disable-libsanitizer for first GCC
diff --git a/sysdeps/x86_64/fpu/math_private.h b/sysdeps/x86_64/fpu/math_private.h
index fcc8537d40..306875f92b 100644
--- a/sysdeps/x86_64/fpu/math_private.h
+++ b/sysdeps/x86_64/fpu/math_private.h
@@ -1,50 +1,6 @@
 #ifndef X86_64_MATH_PRIVATE_H
 #define X86_64_MATH_PRIVATE_H 1
 
-/* We can do a few things better on x86-64.  */
-
-#if defined __AVX__ || defined SSE2AVX
-# define MOVD "vmovd"
-# define MOVQ "vmovq"
-#else
-# define MOVD "movd"
-# define MOVQ "movq"
-#endif
-
-/* Direct movement of float into integer register.  */
-#define EXTRACT_WORDS64(i, d)						      \
-  do {									      \
-    int64_t i_;								      \
-    asm (MOVQ " %1, %0" : "=rm" (i_) : "x" ((double) (d)));		      \
-    (i) = i_;								      \
-  } while (0)
-
-/* And the reverse.  */
-#define INSERT_WORDS64(d, i) \
-  do {									      \
-    int64_t i_ = i;							      \
-    double d__;								      \
-    asm (MOVQ " %1, %0" : "=x" (d__) : "rm" (i_));			      \
-    d = d__;								      \
-  } while (0)
-
-/* Direct movement of float into integer register.  */
-#define GET_FLOAT_WORD(i, d) \
-  do {									      \
-    int i_;								      \
-    asm (MOVD " %1, %0" : "=rm" (i_) : "x" ((float) (d)));		      \
-    (i) = i_;								      \
-  } while (0)
-
-/* And the reverse.  */
-#define SET_FLOAT_WORD(f, i) \
-  do {									      \
-    int i_ = i;								      \
-    float f__;								      \
-    asm (MOVD " %1, %0" : "=x" (f__) : "rm" (i_));			      \
-    f = f__;								      \
-  } while (0)
-
 #include_next <math_private.h>
 
 #ifdef __SSE4_1__