diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 07f01a97bab19f6367bcaab8e4f366bed8aa1206..05dda31335a7877e0b19268ae812e30b14e85587 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-01-18  Jakub Jelinek  <jakub@redhat.com>
+
+	* gcc.target/s390/target-attribute/tattr-2.c: Add -fno-ipa-icf
+	to dg-options.
+	(p0): Add missing dg-error.
+
 2017-01-18  Toma Tabacu  <toma.tabacu@imgtec.com>
 
 	* config/mips/mips.h (ISA_HAS_DIV3): Remove unused macro.
diff --git a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-2.c b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-2.c
index 01ae08ee17fc0dbe92615c4ceda8864fd2e500e4..f0d282f6a66c4c51ef9ac4817adecc5869312095 100644
--- a/gcc/testsuite/gcc.target/s390/target-attribute/tattr-2.c
+++ b/gcc/testsuite/gcc.target/s390/target-attribute/tattr-2.c
@@ -2,7 +2,7 @@
 
 /* { dg-do compile */
 /* { dg-require-effective-target target_attribute } */
-/* { dg-options "-O3 -march=zEC12 -mno-htm" } */
+/* { dg-options "-O3 -march=zEC12 -mno-htm -fno-ipa-icf" } */
 
 #pragma GCC target("htm")
 void p1(void)
@@ -20,7 +20,7 @@ void p0(void)
 #ifdef __HTM__
 #error __HTM__ is defined
 #endif
-  __builtin_tend ();
+  __builtin_tend (); /* { dg-error "is not supported without -mhtm" } */
 }
 #pragma GCC reset_options