a-tags.adb (Check_TSD): Avoid concatenation of strings, as it is not allowed in no...

2011-08-04  Vincent Celier  <celier@adacore.com>

	* a-tags.adb (Check_TSD): Avoid concatenation of strings, as it is not
	allowed in no run time mode.

2011-08-04  Vincent Celier  <celier@adacore.com>

	* make.adb (Check): When -gnatc is used, check for the source file
	inside the ALI file with a canonical case file name.

From-SVN: r177346

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index d8a2abe161e142e640c1e4c1f423e9a79b3c1026..3ce6f2cd786b76c296f844ac21d8a301766a554f 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,13 @@
+2011-08-04  Vincent Celier  <celier@adacore.com>
+
+       * a-tags.adb (Check_TSD): Avoid concatenation of strings, as it is not
+       allowed in no run time mode.
+
+2011-08-04  Vincent Celier  <celier@adacore.com>
+
+       * make.adb (Check): When -gnatc is used, check for the source file
+       inside the ALI file with a canonical case file name.
+
 2011-08-04  Emmanuel Briot  <briot@adacore.com>
 
        * g-comlin.adb, g-comlin.ads (Add_Switch): Put back support for

diff --git a/gcc/ada/a-tags.adb b/gcc/ada/a-tags.adb
index 7070fa792b805e6de40c0f83e9b754db163591fb..d347307987c746fcdb1476645c4c9947d90a833a 100644 (file)
--- a/gcc/ada/a-tags.adb
+++ b/gcc/ada/a-tags.adb
@@ -315,6 +315,8 @@ package body Ada.Tags is
       for E_Tag'Address use TSD.External_Tag.all'Address;
       pragma Import (Ada, E_Tag);
 
+      Dup_Ext_Tag : constant String := "duplicated external tag """;
+
    --  Start of processing for Check_TSD
 
    begin
@@ -324,7 +326,17 @@ package body Ada.Tags is
       T := External_Tag_HTable.Get (To_Address (TSD.External_Tag));
 
       if T /= null then
-         raise Program_Error with "duplicated external tag " & E_Tag;
+         --  Avoid concatenation, as it is not allowed in no run time mode
+
+         declare
+            Msg : String (1 .. Dup_Ext_Tag'Length + E_Tag_Len + 1);
+         begin
+            Msg (1 .. Dup_Ext_Tag'Length) := Dup_Ext_Tag;
+            Msg (Dup_Ext_Tag'Length + 1 .. Dup_Ext_Tag'Length + E_Tag_Len) :=
+              E_Tag;
+            Msg (Msg'Last) := '"';
+            raise Program_Error with Msg;
+         end;
       end if;
    end Check_TSD;
 

diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb
index 29a5d4c339bfad27313fe7d0d30f42e32ca07cab..7ae52f1830d13c6ae496ece285a44bcd8cd28f79 100644 (file)
--- a/gcc/ada/make.adb
+++ b/gcc/ada/make.adb
@@ -1622,10 +1622,14 @@ package body Make is
 
          if Operating_Mode = Check_Semantics then
             declare
-               File_Name : constant String := Get_Name_String (Source_File);
+               File_Name : String := Get_Name_String (Source_File);
                OK        : Boolean := False;
 
             begin
+               --  In the ALI file, the source file names are in canonical case
+
+               Canonical_Case_File_Name (File_Name);
+
                for U in ALIs.Table (ALI).First_Unit ..
                  ALIs.Table (ALI).Last_Unit
                loop