diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index 9e09202..f240e9c 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -105,8 +105,8 @@ ppc64 | 2.6.9-22 | Linux | ignored | ignored | powerpc64-unknown-linux-gnu
 ppc64le | 3.1.0 | Linux | ignored | ignored | powerpc64le-unknown-linux-gnu
 riscv | 1.0 | Twizzler | ignored | ignored | riscv-unknown-twizzler
 riscv32 | ignored | Linux | ignored | ignored | riscv32-unknown-linux-gnu
-riscv64 | ignored | Linux | ignored | ignored | riscv64-unknown-linux-gnu
 riscv32be | ignored | Linux | ignored | ignored | riscv32be-unknown-linux-gnu
+riscv64 | ignored | Linux | ignored | ignored | riscv64-unknown-linux-gnu
 riscv64be | ignored | Linux | ignored | ignored | riscv64be-unknown-linux-gnu
 s390x | 5.6 | SunOS | ignored | ignored | s390x-ibm-solaris2.6
 sun3 | 4.0 | SunOS | ignored | ignored | m68k-sun-sunos4.0
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 2f66981..101a4c4 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -251,7 +251,6 @@ i386-elf					i386-pc-elf
 i386-es						i386-pc-es
 i386-freebsd					i386-pc-freebsd
 i386-glidix					i386-pc-glidix
-i386-serenity					i386-pc-serenity
 i386-haiku					i386-pc-haiku
 i386-isc					i386-pc-isc2.2
 i386-libertybsd					i386-pc-libertybsd
@@ -273,6 +272,7 @@ i386-pc-sco5v6					i386-pc-sco5v6
 i386-pc-sco6					i386-pc-sco5v6
 i386-phoenix					i386-pc-phoenix
 i386-plan9					i386-pc-plan9
+i386-serenity					i386-pc-serenity
 i386-solidbsd					i386-pc-solidbsd
 i386-sortix					i386-pc-sortix
 i386-sun					i386-sun-sunos4.0.2
@@ -548,8 +548,8 @@ pn						pn-gould-sysv
 powerpc						powerpc-unknown-none
 powerpc-bluegene				powerpc-ibm-cnk
 powerpc-cnk					powerpc-ibm-cnk
-powerpc-eabivle					powerpc-unknown-eabivle
 powerpc-eabisim					powerpc-unknown-eabisim
+powerpc-eabivle					powerpc-unknown-eabivle
 powerpc-elf-lynxos				powerpc-elf-lynxos
 powerpc-elf-lynxos5				powerpc-elf-lynxos5
 powerpc-haiku					powerpc-unknown-haiku
@@ -595,24 +595,24 @@ riscv32-company-elf				riscv32-company-elf
 riscv32-company-hcos				riscv32-company-hcos
 riscv32-elf					riscv32-unknown-elf
 riscv32-linux					riscv32-unknown-linux-gnu
-riscv64						riscv64-unknown-none
-riscv64-company-elf				riscv64-company-elf
-riscv64-elf					riscv64-unknown-elf
-riscv64-hcos					riscv64-unknown-hcos
-riscv64-linux					riscv64-unknown-linux-gnu
 riscv32-wrs-vxworks				riscv32-wrs-vxworks
 riscv32be					riscv32be-unknown-none
 riscv32be-company-elf				riscv32be-company-elf
 riscv32be-company-hcos				riscv32be-company-hcos
 riscv32be-elf					riscv32be-unknown-elf
 riscv32be-linux					riscv32be-unknown-linux-gnu
+riscv64						riscv64-unknown-none
+riscv64-company-elf				riscv64-company-elf
+riscv64-elf					riscv64-unknown-elf
+riscv64-hcos					riscv64-unknown-hcos
+riscv64-linux					riscv64-unknown-linux-gnu
 riscv64-wrs-vxworks				riscv64-wrs-vxworks
 riscv64be					riscv64be-unknown-none
 riscv64be-company-elf				riscv64be-company-elf
+riscv64be-company-linux				riscv64be-company-linux-gnu
 riscv64be-elf					riscv64be-unknown-elf
 riscv64be-hcos					riscv64be-unknown-hcos
 riscv64be-linux					riscv64be-unknown-linux-gnu
-riscv64be-company-linux				riscv64be-company-linux-gnu
 rl78						rl78-unknown-none
 rl78-linux					rl78-unknown-linux-gnu
 roadrunner					i386-sun-sunos4.0.2