* gcc-interface/misc.c (gnat_post_options): Disable caret by default.

From-SVN: r187207

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 345f1937d0cbdf0488ae2e668dc5e927674ff6e2..f56496544919b5fdf0851c518b7bd8389b767fbf 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-06  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * gcc-interface/misc.c (gnat_post_options): Disable caret by default.
+
 2012-05-06  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gcc-interface/gigi.h (make_packable_type): Declare.

diff --git a/gcc/ada/gcc-interface/misc.c b/gcc/ada/gcc-interface/misc.c
index 08ca5bb92b33df693332bb2fc021e47243b6accd..974827a787fcd049b14b05277d890985eb4ed950 100644 (file)
--- a/gcc/ada/gcc-interface/misc.c
+++ b/gcc/ada/gcc-interface/misc.c
@@ -235,6 +235,10 @@ gnat_post_options (const char **pfilename ATTRIBUTE_UNUSED)
   /* No psABI change warnings for Ada.  */
   warn_psabi = 0;
 
+  /* No caret by default for Ada.  */
+  if (!global_options_set.x_flag_diagnostics_show_caret)
+    global_dc->show_caret = false;
+
   optimize = global_options.x_optimize;
   optimize_size = global_options.x_optimize_size;
   flag_compare_debug = global_options.x_flag_compare_debug;