diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1d3794c07dc..288c2a0bc07 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-08-31  Olivier Hainque  <hainque@adacore.com>
+
+	* config.gcc (powerpc-wrs-vxworks|vxworksae|vxworksmils): Now
+	match as powerpc-wrs-vxworks*.
+
 2017-08-31  James Greenhalgh  <james.greenhalgh@arm.com>
 
 	* config/aarch64/aarch64-simd.md (aarch64_mla_elt_merge<mode>): Fix
diff --git a/gcc/config.gcc b/gcc/config.gcc
index b5229766b31..428e99a102f 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2551,7 +2551,7 @@ powerpc-wrs-vxworksspe)
 	extra_headers=ppc-asm.h
 	tm_file="${tm_file} vx-common.h vxworks.h powerpcspe/vxworks.h powerpcspe/e500.h"
 	;;
-powerpc-wrs-vxworks|powerpc-wrs-vxworksae|powerpc-wrs-vxworksmils)
+powerpc-wrs-vxworks*)
 	tm_file="${tm_file} elfos.h freebsd-spec.h rs6000/sysv4.h"
 	tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-ppccomm rs6000/t-vxworks"
 	extra_options="${extra_options} rs6000/sysv4.opt"
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 14d20fbfac8..88f94790303 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-08-31  Olivier Hainque  <hainque@adacore.com>
+
+	* config.host (powerpc-wrs-vxworks|vxworksae|vxworksmils): Now
+	match as powerpc-wrs-vxworks*.
+
 2017-08-07  Jonathan Yong  <10walls@gmail.com>
 
 	* config.host (*-cygwin): Include file from mingw
diff --git a/libgcc/config.host b/libgcc/config.host
index 546b12b5971..2686d5933ca 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -1104,7 +1104,7 @@ powerpc*-*-linux*)
 	extra_parts="$extra_parts ecrti.o ecrtn.o ncrti.o ncrtn.o"
 	md_unwind_header=rs6000/linux-unwind.h
 	;;
-powerpc-wrs-vxworks|powerpc-wrs-vxworksae|powerpc-wrs-vxworksmils)
+powerpc-wrs-vxworks*)
 	tmake_file="$tmake_file rs6000/t-ppccomm rs6000/t-savresfgpr t-fdpbit"
 	;;
 powerpc-*-lynxos*)