From: Eric Botcazou <ebotcazou@adacore.com>
Date: Mon, 27 Oct 2014 11:42:01 +0000 (+0000)
Subject: * gcc-interface/utils.c (create_subprog_decl): Adjust condition.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=533d5a2d6c68cd9b301766f4398ed000d39ab7be;p=gcc.git

* gcc-interface/utils.c (create_subprog_decl): Adjust condition.

From-SVN: r216733
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 64fa248c58a..f4aba233905 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-27  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/utils.c (create_subprog_decl): Adjust condition.
+
 2014-10-27  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gcc-interface/misc.c (gnat_init_options_struct): Parameterize errno
diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c
index ef1798e54ce..e823a35b1af 100644
--- a/gcc/ada/gcc-interface/utils.c
+++ b/gcc/ada/gcc-interface/utils.c
@@ -3021,7 +3021,7 @@ create_subprog_decl (tree subprog_name, tree asm_name, tree subprog_type,
      function in the current unit since it is private to the other unit.
      We could inline the nested function as well but it's probably better
      to err on the side of too little inlining.  */
-  if (inline_status != is_enabled
+  if ((inline_status == is_suppressed || inline_status == is_disabled)
       && !public_flag
       && current_function_decl
       && DECL_DECLARED_INLINE_P (current_function_decl)