diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d37ce76f9059156a4dca1eec4ea77cb2c9d30f50..046aea62623c8ff1c84538e18e0a3f808fc90b82 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-14  Toma Tabacu  <toma.tabacu@imgtec.com>
+
+	* gcc.target/mips/msa-builtins-err.c (dg-options): Add 
+	-ffat-lto-objects option.
+
 2016-12-14  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
 	    Jakub Jelinek  <jakub@redhat.com>
 
diff --git a/gcc/testsuite/gcc.target/mips/msa-builtins-err.c b/gcc/testsuite/gcc.target/mips/msa-builtins-err.c
index 041b7f5b5e2ba8e62aeb1eeb9d00d28cfde3b17f..68244d6530295dfdc46e964eec75b3020a9d75bf 100644
--- a/gcc/testsuite/gcc.target/mips/msa-builtins-err.c
+++ b/gcc/testsuite/gcc.target/mips/msa-builtins-err.c
@@ -1,6 +1,8 @@
 /* Test builtins for MIPS MSA ASE instructions */
 /* { dg-do compile } */
-/* { dg-options "-mfp64 -mhard-float -mmsa" } */
+/* { dg-options "-mfp64 -mhard-float -mmsa -ffat-lto-objects" } */
+/* Because this test only uses dg-error, we need to guarantee assembly
+   generation ourselves by using -ffat-lto-objects. */
 
 #include <msa.h>