summaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@gcc.gnu.org>2020-05-09 22:52:21 +0200
committerEric Botcazou <ebotcazou@gcc.gnu.org>2020-05-09 22:52:21 +0200
commite92f85c792c8c5e7846ba2bc7f5e24f08dcdfece (patch)
treea69c67cd2b666786f559e3f8eedcc0aeef578c10 /gcc
parent527ed00b715bf4a945284722b7e766a4f763049f (diff)
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.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ada/ChangeLog5
-rw-r--r--gcc/ada/gcc-interface/misc.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index c118afd6c9d..6ee4942add5 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,10 @@
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>:
Merge with N_Slice.
<N_Allocator>: Move to...
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;
}