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 146aef7bb953358bc0e82fd25793e4d2facf1307..847266ff8640be727bb96c4f417b139e8ea8c385 100644 (file)
--- 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 88a17c09e20f03afecd10a760d53cdeb893deb3e..fc884e551469e982cec35596deb2aec3db6a68d3 100644 (file)
--- 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 d92ff1d77c6d1ed58e5f362571d04963ba4a8c8c..dd7039bdb4a944fae345b47bd0795811e68299c3 100644 (file)
--- 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 d5ba7f073cd33ad98c9ff311fee6a75fc0ce3c83..3c5c782720628106fd47601c818c6f3751e0704f 100644 (file)
--- 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)