[multiple changes]

2010-06-14  Jerome Lambourg  <lambourg@adacore.com>

	* sem_prag.adb (Check_Duplicated_Export_Name): Remove check for
	CLI_Target as this prevents proper detection of exported names
	duplicates when the exported language is different to CIL.
	(Process_Interface_Name): Add check for CIL convention exports,
	replacing the old one from Check_Duplicated_Export_Name.

2010-06-14  Matthew Heaney  <heaney@adacore.com>

	* a-coinve.adb, a-convec.adb (operator "&"): Check both that new length
	and new last satisfy constraints.
	(Delete_Last): prevent overflow for subtraction of index values
	(To_Vector): prevent overflow for addition of index values

From-SVN: r160710

gcc/ada/ChangeLog

+2010-06-14  Jerome Lambourg  <lambourg@adacore.com>
+
+	* sem_prag.adb (Check_Duplicated_Export_Name): Remove check for
+	CLI_Target as this prevents proper detection of exported names
+	duplicates when the exported language is different to CIL.
+	(Process_Interface_Name): Add check for CIL convention exports,
+	replacing the old one from Check_Duplicated_Export_Name.
+
+2010-06-14  Matthew Heaney  <heaney@adacore.com>
+
+	* a-coinve.adb, a-convec.adb (operator "&"): Check both that new length
+	and new last satisfy constraints.
+	(Delete_Last): prevent overflow for subtraction of index values
+	(To_Vector): prevent overflow for addition of index values
+
 2010-06-14  Ed Schonberg  <schonberg@adacore.com>
 
 	* sem_ch4.adb (Complete_Object_Operation): After analyzing the

gcc/ada/sem_prag.adb

@@ -1154,14 +1154,6 @@ package body Sem_Prag is
          String_Val : constant String_Id := Strval (Nam);
 
       begin
-         --  We allow duplicated export names in CIL, as they are always
-         --  enclosed in a namespace that differentiates them, and overloaded
-         --  entities are supported by the VM.
-
-         if VM_Target = CLI_Target then
-            return;
-         end if;
-
          --  We are only interested in the export case, and in the case of
          --  generics, it is the instance, not the template, that is the
          --  problem (the template will generate a warning in any case).
@@ -4140,7 +4132,14 @@ package body Sem_Prag is
 
          Set_Encoded_Interface_Name
            (Get_Base_Subprogram (Subprogram_Def), Link_Nam);
-         Check_Duplicated_Export_Name (Link_Nam);
+
+         --  We allow duplicated export names in CIL, as they are always
+         --  enclosed in a namespace that differentiates them, and overloaded
+         --  entities are supported by the VM.
+
+         if Convention (Subprogram_Def) /= Convention_CIL then
+            Check_Duplicated_Export_Name (Link_Nam);
+         end if;
       end Process_Interface_Name;
 
       -----------------------------------------