From 0c6f926d31da7dfa75fb770646f91ac407478101 Mon Sep 17 00:00:00 2001
From: Arnaud Charlet <charlet@gcc.gnu.org>
Date: Thu, 3 Jan 2013 11:48:22 +0100
Subject: [PATCH] Update comments.

From-SVN: r194844
---
 gcc/ada/gcc-interface/Make-lang.in |  7 +++++--
 gcc/ada/gcc-interface/trans.c      | 10 ++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in
index 0e0cd6d266f..1756b460ef0 100644
--- a/gcc/ada/gcc-interface/Make-lang.in
+++ b/gcc/ada/gcc-interface/Make-lang.in
@@ -49,9 +49,12 @@ COMMON_ADAFLAGS= -gnatpg -gnata
 WARN_ADAFLAGS= -W -Wall
 BOOT_ADAFLAGS= $(COMMON_ADAFLAGS)
 
+# For native builds, the base compiler might be old and we need to arrange for
+# style warnings not to be flagged as errors during stage1.  Cross compilers
+# need to be built by a recent/matching native so we might as well leave the
+# checks fully active.
+
 ifeq ($(CROSS),)
-# If not in cross context we are probably doing a bootstrap
-# so disable warnings during stage1
 ADAFLAGS= $(COMMON_ADAFLAGS) -gnatwns
 else
 ADAFLAGS= $(COMMON_ADAFLAGS)
diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c
index 4d21d2c77ae..6ef6ee89e90 100644
--- a/gcc/ada/gcc-interface/trans.c
+++ b/gcc/ada/gcc-interface/trans.c
@@ -302,15 +302,9 @@ gigi (Node_Id gnat_root, int max_gnat_node, int number_name ATTRIBUTE_UNUSED,
 
   type_annotate_only = (gigi_operating_mode == 1);
 
-#if 0
-  if (Generate_SCO_Instance_Table)
-    flag_debug_instances = 1;
-#else
-  /* Temporary compatibility shim: FSF head back-end does not support instance
-     based debug info discriminators, so disable the generation of the SCO
-     instance table.  ??? */
+  /* ??? Disable the generation of the SCO instance table until after the
+     back-end supports instance based debug info discriminators.  */
   Generate_SCO_Instance_Table = False;
-#endif
 
   for (i = 0; i < number_file; i++)
     {
-- 
2.30.2