From: Vincent Celier Date: Tue, 31 Oct 2006 18:01:41 +0000 (+0100) Subject: lib-load.adb (Load_Unit): Skip the test for a unit not found when its file has alread... X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=53973dcf9d58ce812fb38b2d9e837cbf23f55ebc;p=gcc.git lib-load.adb (Load_Unit): Skip the test for a unit not found when its file has already been loaded... 2006-10-31 Vincent Celier * lib-load.adb (Load_Unit): Skip the test for a unit not found when its file has already been loaded, according to the unit being loaded, not to the current value of Multiple_Unit_Index. From-SVN: r118284 --- diff --git a/gcc/ada/lib-load.adb b/gcc/ada/lib-load.adb index 248c5fcf901..420b4de1930 100644 --- a/gcc/ada/lib-load.adb +++ b/gcc/ada/lib-load.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2005, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2006, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -462,7 +462,7 @@ package body Lib.Load is -- We skip this test in multiple unit per file mode since in this -- case we can have multiple units from the same source file. - if Unum > Units.Last and then Multiple_Unit_Index = 0 then + if Unum > Units.Last and then Get_Unit_Index (Uname_Actual) = 0 then for J in Units.First .. Units.Last loop if Fname = Units.Table (J).Unit_File_Name then if Debug_Flag_L then @@ -610,7 +610,7 @@ package body Lib.Load is Load_Msg_Sloc); Error_Msg_Name_1 := Unit_File_Name (Unum); Error_Msg - ("incorrect spec in file { must be removed first!", + ("\incorrect spec in file { must be removed first!", Load_Msg_Sloc); return No_Unit; end if;