diff --git a/ChangeLog b/ChangeLog
index a323fdc..0bf01ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2018-04-16  John Darrington <john@darrington.wattle.id.au>
+2018-04-16  Ben Elliston  <bje@gnu.org>
+
+	* testsuite/config-sub.data: Sort.
+
+2018-04-16  John Darrington  <john@darrington.wattle.id.au>
 
 	* config.sub (s12z, hcs12z, m68hcs12z, m9s12z): New.
 	* testsuite/config-sub.data: Add test cases.
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 2ecbe7f..bc7c833 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -144,6 +144,7 @@ ft32-elf					ft32-unknown-elf
 ft32						ft32-unknown-none
 h8300						h8300-unknown-none
 h8500						h8500-unknown-none
+hcs12z						s12z-unknown-none
 hexagon						hexagon-unknown-elf
 hexagon-linux					hexagon-unknown-linux-gnu
 hppa1.0						hppa1.0-unknown-none
@@ -227,11 +228,13 @@ m32c						m32c-unknown-none
 m32rle						m32rle-unknown-none
 m32r						m32r-unknown-none
 m68000						m68000-unknown-none
-m68k						m68k-unknown-none
+m68hcs12z					s12z-unknown-none
 m68k-es1800					m68k-unknown-ose
+m68k						m68k-unknown-none
 m68knommu					m68k-unknown-linux-gnu
 m88k						m88k-unknown-none
 m88k-omron					m88k-omron-luna
+m9s12z						s12z-unknown-none
 maxq-elf					maxq-unknown-elf
 maxq						maxq-unknown-none
 mb-elf						mb-unknown-elf
@@ -379,9 +382,9 @@ powerpc-pikeos					powerpc-unknown-elf
 powerpc						powerpc-unknown-none
 powerpc-sysgo-pikeos				powerpc-sysgo-elf
 powerpc-xcoff-lynxos178				powerpc-xcoff-lynxos178
-ppc-beos					powerpc-be-beos
 ppcbe-elf					powerpc-unknown-elf
 ppcbe-none-elf					powerpc-none-elf
+ppc-beos					powerpc-be-beos
 ppcbe						powerpc-unknown-none
 ppc-elf						powerpc-unknown-elf
 ppcle-elf					powerpcle-unknown-elf
@@ -409,13 +412,11 @@ rl78-linux					rl78-unknown-linux-gnu
 rl78						rl78-unknown-none
 rx-linux					rx-unknown-linux-gnu
 rx						rx-unknown-none
+s12z						s12z-unknown-none
 s390-ibm-zvmoe					s390-ibm-zvmoe
 score-elf					score-unknown-elf
 score						score-unknown-elf
 sde-elf						mipsisa32-sde-elf
-sh						sh-unknown-none
-sh-elf						sh-unknown-elf
-sh-hms						sh-hitachi-hms
 sh1-elf						sh1-unknown-elf
 sh1le-elf					sh1le-unknown-elf
 sh1						sh1-unknown-none
@@ -455,9 +456,12 @@ shbe						shbe-unknown-none
 sheb-elf					sheb-unknown-elf
 sheb						sheb-unknown-none
 sh-elf						sh-unknown-elf
+sh-elf						sh-unknown-elf
+sh-hms						sh-hitachi-hms
 shle-elf					shle-unknown-elf
 shle						shle-unknown-none
 sh						sh-unknown-none
+sh						sh-unknown-none
 sh-toppers					sh-unknown-toppers
 simso-wrs					sparclite-wrs-vxworks
 sparc64b-linux					sparc64b-unknown-linux-gnu
@@ -568,7 +572,3 @@ xtensa						xtensa-unknown-none
 z80-coff					z80-unknown-coff
 z80						z80-unknown-none
 z8k						z8k-unknown-none
-m9s12z						s12z-unknown-none
-m68hcs12z					s12z-unknown-none
-hcs12z						s12z-unknown-none
-s12z						s12z-unknown-none