aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/function.c3
2 files changed, 9 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 94f2d9c..8d4f5ba 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 26d25b9..ac50f4a 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;
}
}