From: Dominik Vogt <vogt@linux.vnet.ibm.com>
Date: Tue, 31 Mar 2015 11:54:34 +0000 (+0000)
Subject: Backport missing pieces from mainline.
X-Git-Tag: releases/gcc-4.8.5~186
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4474519933823034d876448d87eab475ac744ee;p=thirdparty%2Fgcc.git

Backport missing pieces from mainline.

gcc/
2015-03-27  Dominik Vogt  <vogt@linux.vnet.ibm.com>

	* config/s390/s390.c (s390_function_num_hotpatch_hw): Remove special
	cases for not hotpatching main () and artificial functions.

gcc/testsuite
2015-03-27  Dominik Vogt  <vogt@linux.vnet.ibm.com>

	* gcc.target/s390/hotpatch-compile-16.c: Remove include of stdio.h.

From-SVN: r221791
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 146aef7bb953..847266ff8640 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-31  Dominik Vogt  <vogt@linux.vnet.ibm.com>
+
+	* config/s390/s390.c (s390_function_num_hotpatch_hw): Remove special
+	cases for not hotpatching main () and artificial functions.
+
 2015-03-26  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
 
 	Backport of r214242, r214254, and bug fix patches from mainline
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 88a17c09e20f..fc884e551469 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -5447,13 +5447,6 @@ s390_function_num_hotpatch_hw (tree decl,
   *hw_before = 0;
   *hw_after = 0;
 
-  if (DECL_ARTIFICIAL (decl)
-      || MAIN_NAME_P (DECL_NAME (decl)))
-    {
-      /* - Artificial functions need not be hotpatched.
-	 - Making the main function hotpatchable is useless.  */
-      return false;
-    }
   attr = lookup_attribute ("hotpatch", DECL_ATTRIBUTES (decl));
 
   /* Handle the arguments of the hotpatch attribute.  The values
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d92ff1d77c6d..dd7039bdb4a9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-31  Dominik Vogt  <vogt@linux.vnet.ibm.com>
+
+	* gcc.target/s390/hotpatch-compile-16.c: Remove include of stdio.h.
+
 2015-03-26  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
 
 	Backport r214254 and related tests from mainline
diff --git a/gcc/testsuite/gcc.target/s390/hotpatch-compile-16.c b/gcc/testsuite/gcc.target/s390/hotpatch-compile-16.c
index d5ba7f073cd3..3c5c78272062 100644
--- a/gcc/testsuite/gcc.target/s390/hotpatch-compile-16.c
+++ b/gcc/testsuite/gcc.target/s390/hotpatch-compile-16.c
@@ -3,8 +3,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O3 -mzarch" } */
 
-#include <stdio.h>
-
 typedef int (*fn_t)(void);
 
 fn_t hp1(void)