diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c40ab1b3352..4ef9c7f6bb1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-01  Pedro Alves  <palves@redhat.com>
+
+	* features/Makefile (WHICH): Remove arm-with-m,
+	arm-with-m-fpa-layout and arm-with-m-vfp-d16.
+
 2014-10-01  Pedro Alves  <palves@redhat.com>
 
 	* features/Makefile (clean): New rule.
diff --git a/gdb/features/Makefile b/gdb/features/Makefile
index f30fc13ddfd..f967e4c8173 100644
--- a/gdb/features/Makefile
+++ b/gdb/features/Makefile
@@ -32,7 +32,6 @@
 
 WHICH = aarch64 \
 	arm-with-iwmmxt arm-with-vfpv2 arm-with-vfpv3 arm-with-neon \
-	arm-with-m arm-with-m-fpa-layout arm-with-m-vfp-d16 \
 	i386/i386 i386/i386-linux \
 	i386/i386-mmx i386/i386-mmx-linux \
 	i386/amd64 i386/amd64-linux \