4 files changed, 14 insertions, 10 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fab0df2..0590f02 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2015-06-01  Jakub Jelinek  <jakub@redhat.com>
+
+	* gcc.target/s390/hotpatch-compile-15.c: Remove dg-prune-output
+	directives.
+	(hp3, hp4): Add inline keyword.
+	* gcc.target/s390/hotpatch-19.c: Remove dg-prune-output directive.
+	(hp2): Add inline keyword.
+	* gcc.target/s390/hotpatch-19.c: Remove dg-prune-output directives.
+	(hp2): Add inline keyword.
+
 2015-06-01  Ilya Enkovich  <ilya.enkovich@intel.com>
 
 	PR target/65527
diff --git a/gcc/testsuite/gcc.target/s390/hotpatch-19.c b/gcc/testsuite/gcc.target/s390/hotpatch-19.c
index c69b35e..bb8a137 100644
--- a/gcc/testsuite/gcc.target/s390/hotpatch-19.c
+++ b/gcc/testsuite/gcc.target/s390/hotpatch-19.c
@@ -5,9 +5,8 @@
 
 #include <stdio.h>
 
-/* { dg-prune-output "always_inline function might not be inlinable" } */
 __attribute__ ((always_inline))
-static void hp2(void)
+static inline void hp2(void)
 {
   printf("hello, world!\n");
 }
diff --git a/gcc/testsuite/gcc.target/s390/hotpatch-20.c b/gcc/testsuite/gcc.target/s390/hotpatch-20.c
index 0a32a68..222ae5a 100644
--- a/gcc/testsuite/gcc.target/s390/hotpatch-20.c
+++ b/gcc/testsuite/gcc.target/s390/hotpatch-20.c
@@ -5,15 +5,13 @@
 
 #include <stdio.h>
 
-/* { dg-prune-output "always_inline function might not be inlinable" } */
 __attribute__ ((hotpatch(1,2)))
 __attribute__ ((always_inline))
-static void hp2(void)
+static inline void hp2(void)
 {
   printf("hello, world!\n");
 }
 
-/* { dg-prune-output "called from here" } */
 void hp1(void)
 {
   hp2();
diff --git a/gcc/testsuite/gcc.target/s390/hotpatch-compile-15.c b/gcc/testsuite/gcc.target/s390/hotpatch-compile-15.c
index 4ce7375..12e04ea 100644
--- a/gcc/testsuite/gcc.target/s390/hotpatch-compile-15.c
+++ b/gcc/testsuite/gcc.target/s390/hotpatch-compile-15.c
@@ -3,9 +3,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O3 -mzarch" } */
 
-/* { dg-prune-output "always_inline function might not be inlinable" } */
-/* { dg-prune-output "called from here" } */
-
 #include <stdio.h>
 
 __attribute__ ((hotpatch(1,2)))
@@ -22,14 +19,14 @@ static inline void hp2(void)
 
 __attribute__ ((hotpatch(0,0)))
 __attribute__ ((always_inline))
-static void hp3(void)
+static inline void hp3(void)
 {
   printf("hello, world!\n");
 }
 
 __attribute__ ((hotpatch(1,2)))
 __attribute__ ((always_inline))
-static void hp4(void)
+static inline void hp4(void)
 {
   printf("hello, world!\n");
 }