From: Eric Botcazou <ebotcazou@adacore.com>
Date: Sun, 6 May 2012 10:46:17 +0000 (+0000)
Subject: * gcc-interface/misc.c (gnat_post_options): Disable caret by default.
X-Git-Tag: misc/gccgo-go1_1_2~3071
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1a5b6cd2af58039fc40ae410ad8fb272b4002ca8;p=thirdparty%2Fgcc.git

* 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 345f1937d0cb..f56496544919 100644
--- 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 08ca5bb92b33..974827a787fc 100644
--- 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;