diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f603df53075e02f172f98c223f3abb51d221d06d..810cd751dd3af7e322d808f9fc8b5f8fe45838f6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2017-06-16  Richard Earnshaw  <rearnsha@arm.com>
+
+	* config/arm/t-linux-eabi (MULTILIB_EXCEPTIONS): Set to empty.
+        (MULTILIB_RESUE): Likewise.
+        (MULTILIB_MATCHES): Likewise.
+        (MULTLIB_REQUIRED): Likewise.
+
 2017-06-16  Richard Earnshaw  <rearnsha@arm.com>
 
 	* config/arm/t-rtems: Rewrite for new option framework.
diff --git a/gcc/config/arm/t-linux-eabi b/gcc/config/arm/t-linux-eabi
index 117c0eba948bd62c2a599495f63db84966a64811..c11af7a92deb82e7ba07e084e884896846122e48 100644
--- a/gcc/config/arm/t-linux-eabi
+++ b/gcc/config/arm/t-linux-eabi
@@ -22,6 +22,10 @@
 # MULTILIB_DEFAULTS in linux-elf.h.
 MULTILIB_OPTIONS	=
 MULTILIB_DIRNAMES	=
+MULTILIB_EXCEPTIONS	=
+MULTILIB_REUSE		=
+MULTILIB_MATCHES	=
+MULTILIB_REQUIRED	=
 
 #MULTILIB_OPTIONS     += mcpu=fa606te/mcpu=fa626te/mcpu=fmp626/mcpu=fa726te
 #MULTILIB_DIRNAMES    += fa606te fa626te fmp626 fa726te