diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f9e00198bbf..1eb860cce4c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-27  Jerome Lambourg  <lambourg@adacore.com>
+
+	* config.gcc (i*86-wrs-vxworks7): Handle new acceptable triplet.
+	(x86_64-wrs-vxworks7): Likewise.
+
 2017-06-27  Marek Polacek  <polacek@redhat.com>
 
 	PR sanitizer/81223
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 291200984d9..a97bbc856a4 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1680,8 +1680,15 @@ i[34567]86-*-solaris2* | x86_64-*-solaris2.1[0-9]*)
 		esac
 	fi
 	;;
-i[4567]86-wrs-vxworks|i[4567]86-wrs-vxworksae)
-	tm_file="${tm_file} i386/unix.h i386/att.h elfos.h vx-common.h"
+i[4567]86-wrs-vxworks|i[4567]86-wrs-vxworksae|i[4567]86-wrs-vxworks7|x86_64-wrs-vxworks7)
+	tm_file="${tm_file} i386/unix.h i386/att.h elfos.h"
+	case ${target} in
+	  x86_64-*)
+	    need_64bit_isa=yes
+	    tm_file="${tm_file} i386/x86-64.h"
+	    ;;
+	esac
+	tm_file="${tm_file} vx-common.h"
 	case ${target} in
 	  *-vxworksae*)
 	    tm_file="${tm_file} vxworksae.h i386/vxworks.h i386/vxworksae.h"
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 330d781a226..924543cd206 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-27  Jerome Lambourg  <lambourg@adacore.com>
+
+	* config.host (i*86-wrs-vxworks7): Handle new acceptable triplet.
+	(x86_64-wrs-vxworks7): Likewise.
+
 2017-06-27  Olivier Hainque  <hainque@adacore.com>
 
 	* config/t-vxworks7: New file.
diff --git a/libgcc/config.host b/libgcc/config.host
index 2da578ed199..cf62e0e54f7 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -675,7 +675,7 @@ i[34567]86-*-solaris2* | x86_64-*-solaris2.1[0-9]*)
 	tm_file="${tm_file} i386/elf-lib.h"
 	md_unwind_header=i386/sol2-unwind.h
 	;;
-i[4567]86-wrs-vxworks|i[4567]86-wrs-vxworksae)
+i[4567]86-wrs-vxworks|i[4567]86-wrs-vxworksae|i[4567]86-wrs-vxworks7|x86_64-wrs-vxworks7)
 	;;
 i[34567]86-*-cygwin*)
 	extra_parts="crtbegin.o crtbeginS.o crtend.o crtfastmath.o"