misc.c (gnat_init_gcc_eh): Do not override the switch -fnon-call-exceptions passed...

	* gcc-interface/misc.c (gnat_init_gcc_eh): Do not override the switch
	-fnon-call-exceptions passed on the command line in -gnatp mode.

From-SVN: r266178

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index d709c36718270993bf3224b949d2fb5911249ca8..9a70120ce6fc562305e24a6af2b66f18cd86da84 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2018-11-15  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * gcc-interface/misc.c (gnat_init_gcc_eh): Do not override the switch
+       -fnon-call-exceptions passed on the command line in -gnatp mode.
+
 2018-11-13  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gcc-interface/misc.c (gnat_init_gcc_eh): Set -fnon-call-exceptions

diff --git a/gcc/ada/gcc-interface/misc.c b/gcc/ada/gcc-interface/misc.c
index d3f88d33475c445fcb208e237c49b61a4b79a17e..f23d7337e0a8909625ff81d910d49f8a687059fa 100644 (file)
--- a/gcc/ada/gcc-interface/misc.c
+++ b/gcc/ada/gcc-interface/misc.c
@@ -416,7 +416,10 @@ gnat_init_gcc_eh (void)
   flag_exceptions = 1;
   flag_delete_dead_exceptions = 1;
   if (Suppress_Checks)
-    flag_non_call_exceptions = Machine_Overflows_On_Target && GNAT_Mode;
+    {
+      if (!global_options_set.x_flag_non_call_exceptions)
+       flag_non_call_exceptions = Machine_Overflows_On_Target && GNAT_Mode;
+    }
   else
     {
       flag_non_call_exceptions = 1;