diff --git a/ChangeLog b/ChangeLog
index 2c28f9b..600658c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-24  John Ericson  <john.ericson@obsidian.systems>
+
+	* config.sub (arm6m, armv[78][arm]): Recognise.
+	* testsuite/config-sub.data: Add tests.
+
 2018-04-16  Mao Han  <han_mao@c-sky.com>
 
 	* config.sub (csky, csky-*): Recognise.
diff --git a/config.sub b/config.sub
index 657a862..ba37cf9 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-04-16'
+timestamp='2018-04-24'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -249,7 +249,7 @@ case $basic_machine in
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arceb \
-	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv6m | armv[78][arm] \
 	| avr | avr32 \
 	| ba \
 	| be32 | be64 \
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 474dce8..c325e3b 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -66,6 +66,7 @@ armv6eb-unknown-netbsdelf7.0			armv6eb-unknown-netbsdelf7.0
 armv6eb-unknown-netbsdelf7.0-eabi		armv6eb-unknown-netbsdelf7.0-eabi
 armv6eb-unknown-netbsdelf7.0-eabihf		armv6eb-unknown-netbsdelf7.0-eabihf
 armv6-linux-gnu					armv6-unknown-linux-gnu
+armv6m						armv6m-unknown-none
 armv6-unknown-netbsdelf7.0			armv6-unknown-netbsdelf7.0
 armv6-unknown-netbsdelf7.0-eabi			armv6-unknown-netbsdelf7.0-eabi
 armv6-unknown-netbsdelf7.0-eabihf		armv6-unknown-netbsdelf7.0-eabihf
@@ -75,10 +76,15 @@ armv7-apple-ios					armv7-apple-ios
 armv7eb-unknown-netbsdelf7.0			armv7eb-unknown-netbsdelf7.0
 armv7eb-unknown-netbsdelf7.0-eabi		armv7eb-unknown-netbsdelf7.0-eabi
 armv7eb-unknown-netbsdelf7.0-eabihf		armv7eb-unknown-netbsdelf7.0-eabihf
+armv7m						armv7m-unknown-none
+armv7r						armv7r-unknown-none
 armv7-unknown-netbsdelf7.0			armv7-unknown-netbsdelf7.0
 armv7-unknown-netbsdelf7.0-eabi			armv7-unknown-netbsdelf7.0-eabi
 armv7-unknown-netbsdelf7.0-eabihf		armv7-unknown-netbsdelf7.0-eabihf
+armv8a						armv8a-unknown-none
 armv8b-linux-gnueabi				armv8b-unknown-linux-gnueabi
+armv8m						armv8m-unknown-none
+armv8r						armv8r-unknown-none
 aros						i386-pc-aros
 asmjs						asmjs-unknown-none
 avr32						avr32-unknown-none