aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@adacore.com>2018-11-15 12:06:46 +0000
committerEric Botcazou <ebotcazou@gcc.gnu.org>2018-11-15 12:06:46 +0000
commit5f3040ed5a0c9283279a0d2d3dfb815d8f0ad485 (patch)
treedcfd4ad22cd1852ad2cd37a1c21c44f228c2d1d8
parentbca7138a499a88d774ada82f0401ad0981fe7572 (diff)
downloadgcc-5f3040ed5a0c9283279a0d2d3dfb815d8f0ad485.zip
gcc-5f3040ed5a0c9283279a0d2d3dfb815d8f0ad485.tar.gz
gcc-5f3040ed5a0c9283279a0d2d3dfb815d8f0ad485.tar.bz2
misc.c (gnat_init_gcc_eh): Do not override the switch -fnon-call-exceptions passed on the command line in...
* 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: r266176
-rw-r--r--gcc/ada/ChangeLog5
-rw-r--r--gcc/ada/gcc-interface/misc.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index d600411..589f52f 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -7,6 +7,11 @@
* exp_ch4.adb (Expand_Boolean_Operation): Use this new profile.
* exp_pakd.adb (Expand_Packed_Boolean_Operator): Ditto.
+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-14 Patrick Bernardi <bernardi@adacore.com>
* libgnarl/a-intnam__linux.ads: Add SIGSYS.
diff --git a/gcc/ada/gcc-interface/misc.c b/gcc/ada/gcc-interface/misc.c
index 53913c2..00b7370 100644
--- a/gcc/ada/gcc-interface/misc.c
+++ b/gcc/ada/gcc-interface/misc.c
@@ -412,7 +412,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;