From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 1 Jun 2015 11:43:34 +0000 (+0200)
Subject: hotpatch-compile-15.c: Remove dg-prune-output directives.
X-Git-Tag: releases/gcc-4.9.3~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0367f636a96da7c8662a3f86f91c51b803df017;p=thirdparty%2Fgcc.git

hotpatch-compile-15.c: Remove dg-prune-output directives.

	* 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.

From-SVN: r223936
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d4f5ddb3dcb1..2fb4f836bbe7 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  Dominik Vogt  <vogt@linux.vnet.ibm.com>
 
 	Backport from mainline
diff --git a/gcc/testsuite/gcc.target/s390/hotpatch-19.c b/gcc/testsuite/gcc.target/s390/hotpatch-19.c
index c69b35e562a5..bb8a137edb06 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 0a32a68993f4..222ae5a60530 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 4ce7375a7c31..12e04ea33e6f 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");
 }