From: Andi Kleen <ak@linux.intel.com>
Date: Tue, 16 Sep 2014 03:22:41 +0000 (+0000)
Subject: Always set DECL_NO_INSTRUMENT_FUNCTION_ENTRY_EXIT correctly
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0b37ba8a60c70a212e1f663ddcb3bbf8b2468d6b;p=gcc.git

Always set DECL_NO_INSTRUMENT_FUNCTION_ENTRY_EXIT correctly

When profiling is disabled force DECL_NO_INSTRUMENT_FUNCTION_ENTRY_EXIT
for each function to one. This information is then preserved
through LTO.

With this patch for LTO builds -pg needs to be set on both the
LTO final link and the original source build, to allow -pg
(or -pg -fentry) to be active for that source file. This allows
to build large projects mostly with -pg, except for a few files,
and still use LTO.

gcc/:

2014-09-15  Andi Kleen  <ak@linux.intel.com>

	* function.c (allocate_struct_function): Force
	DECL_NO_INSTRUMENT_FUNCTION_ENTRY_EXIT to one when
	profiling is disabled.

From-SVN: r215284
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 94f2d9cbf5c..8d4f5ba1c37 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-15  Andi Kleen  <ak@linux.intel.com>
+
+	* function.c (allocate_struct_function): Force
+	DECL_NO_INSTRUMENT_FUNCTION_ENTRY_EXIT to one when
+	profiling is disabled.
+
 2014-09-15  Trevor Saunders  <tsaunders@mozilla.com>
     
     	* cfgrtl.c, combine.c, config/arc/arc.c, config/mcore/mcore.c,
diff --git a/gcc/function.c b/gcc/function.c
index 26d25b9b4bf..ac50f4af41a 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -4555,6 +4555,9 @@ allocate_struct_function (tree fndecl, bool abstract_p)
          but is this worth the hassle?  */
       cfun->can_throw_non_call_exceptions = flag_non_call_exceptions;
       cfun->can_delete_dead_exceptions = flag_delete_dead_exceptions;
+
+      if (!profile_flag && !flag_instrument_function_entry_exit)
+	DECL_NO_INSTRUMENT_FUNCTION_ENTRY_EXIT (fndecl) = 1;
     }
 }