diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/utils.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 64fa248..f4aba23 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,9 @@ 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 support here instead of... Do not set flag_delete_dead_exceptions to 1 unconditionally. diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c index ef1798e..e823a35 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) |