diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8654289e58b..fbd23bf76a1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-11  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* config/aarch64/aarch64.c (aarch64_reinterpret_float_as_int):
+	Use scalar_float_mode.
+
 2018-01-11  Richard Sandiford  <richard.sandiford@linaro.org>
 
 	* config/aarch64/aarch64-simd.md
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 0aea458c4a2..d8ae9d2238c 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -4806,9 +4806,9 @@ aarch64_reinterpret_float_as_int (rtx value, unsigned HOST_WIDE_INT *intval)
       return true;
     }
 
-  machine_mode mode = GET_MODE (value);
+  scalar_float_mode mode;
   if (GET_CODE (value) != CONST_DOUBLE
-      || !SCALAR_FLOAT_MODE_P (mode)
+      || !is_a <scalar_float_mode> (GET_MODE (value), &mode)
       || GET_MODE_BITSIZE (mode) > HOST_BITS_PER_WIDE_INT
       /* Only support up to DF mode.  */
       || GET_MODE_BITSIZE (mode) > GET_MODE_BITSIZE (DFmode))