From: ebotcazou Date: Mon, 27 Oct 2014 11:42:01 +0000 (+0000) Subject: * gcc-interface/utils.c (create_subprog_decl): Adjust condition. X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a073bb9746e6569e6aad26d196ee61f31e2a8a17;p=thirdparty%2Fgcc.git * gcc-interface/utils.c (create_subprog_decl): Adjust condition. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@216733 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 64fa248c58a3..f4aba2339054 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,7 @@ +2014-10-27 Eric Botcazou + + * gcc-interface/utils.c (create_subprog_decl): Adjust condition. + 2014-10-27 Eric Botcazou * 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 ef1798e54ce6..e823a35b1afb 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)