From: charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 15 Jul 2009 10:34:59 +0000 (+0000)
Subject: 2009-07-15  Robert Dewar  <dewar@adacore.com>
X-Git-Tag: upstream/4.9.2~34820
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0423f7520c17e6e2521aafbf5e9663ec94cf8590;p=platform%2Fupstream%2Flinaro-gcc.git

2009-07-15  Robert Dewar  <dewar@adacore.com>

	* lib-load.adb: Minor reformatting

	* lib-writ.adb (Write_ALI): Fix handling of SCO_Output wrt Generate_SCO.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@149678 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index b52756a..c9994b9 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,11 @@
 2009-07-15  Robert Dewar  <dewar@adacore.com>
 
+	* lib-load.adb: Minor reformatting
+
+	* lib-writ.adb (Write_ALI): Fix handling of SCO_Output wrt Generate_SCO.
+
+2009-07-15  Robert Dewar  <dewar@adacore.com>
+
 	* par.adb: Minor reformatting
 	Add ??? comment for possible bad comment
 
diff --git a/gcc/ada/lib-load.adb b/gcc/ada/lib-load.adb
index ee956dc..535dddc 100644
--- a/gcc/ada/lib-load.adb
+++ b/gcc/ada/lib-load.adb
@@ -396,7 +396,7 @@ package body Lib.Load is
                begin
                   while Nkind (Par) = N_Selected_Component
                     and then Chars (Selector_Name (Par)) /=
-                      Chars (Cunit_Entity (Unump))
+                             Chars (Cunit_Entity (Unump))
                   loop
                      Par := Prefix (Par);
                   end loop;
@@ -694,6 +694,9 @@ package body Lib.Load is
             --  Remove load stack entry and return the entry in the file table
 
             Load_Stack.Decrement_Last;
+
+            --  All done, return unit number
+
             return Unum;
 
          --  Case of file not found
diff --git a/gcc/ada/lib-writ.adb b/gcc/ada/lib-writ.adb
index 01f92d1..94d4b45 100644
--- a/gcc/ada/lib-writ.adb
+++ b/gcc/ada/lib-writ.adb
@@ -1230,20 +1230,20 @@ package body Lib.Writ is
          end loop;
       end;
 
-      --  Output cross-reference information
+      --  Output cross-references
 
-      Write_Info_Terminate;
       Output_References;
 
       --  Output SCO information if present
 
       if Generate_SCO then
-         Write_Info_Terminate;
          SCO_Output;
       end if;
 
-      --  Output of ALI file is complete
+      --  Output final blank line and we are done. This final blank line is
+      --  probably junk, but we don't feel like making an incompatible change!
 
+      Write_Info_Terminate;
       Close_Output_Library_Info;
    end Write_ALI;