From 671eb58697ed6f7069e657f880e03874d1b9c6b4 Mon Sep 17 00:00:00 2001 From: Robert Dewar Date: Wed, 15 Jul 2009 10:34:59 +0000 Subject: [PATCH] lib-load.adb: Minor reformatting 2009-07-15 Robert Dewar * lib-load.adb: Minor reformatting * lib-writ.adb (Write_ALI): Fix handling of SCO_Output wrt Generate_SCO. From-SVN: r149678 --- gcc/ada/ChangeLog | 6 ++++++ gcc/ada/lib-load.adb | 5 ++++- gcc/ada/lib-writ.adb | 8 ++++---- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index b52756a797c8..c9994b98109a 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2009-07-15 Robert Dewar + + * lib-load.adb: Minor reformatting + + * lib-writ.adb (Write_ALI): Fix handling of SCO_Output wrt Generate_SCO. + 2009-07-15 Robert Dewar * par.adb: Minor reformatting diff --git a/gcc/ada/lib-load.adb b/gcc/ada/lib-load.adb index ee956dc3f77a..535dddc6e8b7 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 01f92d1e20a0..94d4b4555267 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; -- 2.47.2