diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 72dc183738d..b229c4a129d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2016-08-26  Max Filippov  <jcmvbkbc@gmail.com>
+
+	* config/xtensa/xtensa.c (xtensa_expand_prologue): Update
+	current_function_static_stack_size variable with the static
+	stack frame size of the current function when
+	flag_stack_usage_info is enabled.
+
 2016-08-26  Nathan Sidwell  <nathan@acm.org>
 
 	* ipa-inline-analysis.c (inline_write_summary): Remove unnecessary
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
index 64d089bdfb0..917ea94840f 100644
--- a/gcc/config/xtensa/xtensa.c
+++ b/gcc/config/xtensa/xtensa.c
@@ -2678,6 +2678,9 @@ xtensa_expand_prologue (void)
 
   total_size = compute_frame_size (get_frame_size ());
 
+  if (flag_stack_usage_info)
+    current_function_static_stack_size = total_size;
+
   if (TARGET_WINDOWED_ABI)
     {
       if (total_size < (1 << (12+3)))