[gcc/devel/autopar_devel] Do not override -fnon-call-exceptions in default mode

[gcc/devel/autopar_devel] Do not override -fnon-call-exceptions in default mode

[Giuliano Belinassi]

https://gcc.gnu.org/g:332fa999e61e196c2529b2e0e434de48180992e6

commit 332fa999e61e196c2529b2e0e434de48180992e6
Author: Eric Botcazou <ebotcazou@gcc.gnu.org>
Date:   Sat May 9 22:52:21 2020 +0200

    Do not override -fnon-call-exceptions in default mode
    
    This was already the case in -gnatp mode.
    
            * gcc-interface/misc.c (gnat_init_gcc_eh): Do not override the user
            for -fnon-call-exceptions in default mode.

Diff:
---
 gcc/ada/ChangeLog            | 5 +++++
 gcc/ada/gcc-interface/misc.c | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index c118afd6c9d..6ee4942add5 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-09  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/misc.c (gnat_init_gcc_eh): Do not override the user
+	for -fnon-call-exceptions in default mode.
+
 2020-05-09  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gcc-interface/trans.c (lvalue_required_p) <N_Selected_Component>:
diff --git a/gcc/ada/gcc-interface/misc.c b/gcc/ada/gcc-interface/misc.c
index d68b37384ff..2950cb8194d 100644
--- a/gcc/ada/gcc-interface/misc.c
+++ b/gcc/ada/gcc-interface/misc.c
@@ -417,7 +417,8 @@ gnat_init_gcc_eh (void)
     }
   else
     {
-      flag_non_call_exceptions = 1;
+      if (!global_options_set.x_flag_non_call_exceptions)
+        flag_non_call_exceptions = 1;
       flag_aggressive_loop_optimizations = 0;
       warn_aggressive_loop_optimizations = 0;
     }