[multiple changes]

2012-10-29  Pascal Obry  <obry@adacore.com>

	* xoscons.adb, Make-generated.in; The template used by xoscons is now
	given as parameter.
	* gcc-interface/Make-lang.in: Update dependencies.

2012-10-29  Yannick Moy  <moy@adacore.com>

	* exp_dbug.adb (Qualify_Entity_Name): Only do renaming in formal
	verification mode when there is a homonym.

From-SVN: r192942

gcc/ada/ChangeLog

+2012-10-29  Pascal Obry  <obry@adacore.com>
+
+	* xoscons.adb, Make-generated.in; The template used by xoscons is now
+	given as parameter.
+	* gcc-interface/Make-lang.in: Update dependencies.
+
+2012-10-29  Yannick Moy  <moy@adacore.com>
+
+	* exp_dbug.adb (Qualify_Entity_Name): Only do renaming in formal
+	verification mode when there is a homonym.
+
 2012-10-29  Thomas Quinot  <quinot@adacore.com>
 
 	* xoscons.adb: Minor reformatting.

gcc/ada/Make-generated.in

@@ -93,7 +93,7 @@ $(ADA_GEN_SUBDIR)/s-oscons.ads : $(ADA_GEN_SUBDIR)/s-oscons-tmplt.c $(ADA_GEN_SU
 		$(RM) s-oscons-tmplt.i s-oscons-tmplt.s ; \
 		$(OSCONS_CPP) ; \
 		$(OSCONS_EXTRACT) ; \
-		./xoscons ) ; \
+		./xoscons s-oscons ) ; \
 		$(MOVE_IF_CHANGE) $(ADA_GEN_SUBDIR)/bldtools/oscons/s-oscons.ads $(ADA_GEN_SUBDIR)/s-oscons.ads ; \
 		$(MOVE_IF_CHANGE) $(ADA_GEN_SUBDIR)/bldtools/oscons/s-oscons.h $(ADA_GEN_SUBDIR)/s-oscons.h
 

gcc/ada/exp_dbug.adb

@@ -1315,10 +1315,13 @@ package body Exp_Dbug is
       --  qualifying names when needed.
 
       elsif Alfa_Mode then
-         Get_Name_String (Chars (Ent));
-         Append_Homonym_Number (Ent);
-         Output_Homonym_Numbers_Suffix;
-         Set_Chars (Ent, Name_Enter);
+         if Has_Homonym (Ent) then
+            Get_Name_String (Chars (Ent));
+            Append_Homonym_Number (Ent);
+            Output_Homonym_Numbers_Suffix;
+            Set_Chars (Ent, Name_Enter);
+         end if;
+
          return;
 
       --  If the entity is a variable encoding the debug name for an object

gcc/ada/xoscons.adb

@@ -23,16 +23,18 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
---  This program generates the spec of System.OS_Constants (s-oscons.ads)
+--  The base name of the template file is given by Argument (1). This program
+--  generates the spec for this specified unit (let's call it UNIT_NAME).
 
 --  It works in conjunction with a C template file which must be pre-processed
 --  and compiled using the cross compiler. Two input files are used:
---    - the preprocessed C file: s-oscons-tmplt.i
---    - the generated assembly file: s-oscons-tmplt.s
+--    - the preprocessed C file: UNIT_NAME-tmplt.i
+--    - the generated assembly file: UNIT_NAME-tmplt.s
 
---  The contents of s-oscons.ads is written on standard output
+--  The generated files are UNIT_NAME.ads and UNIT_NAME.h
 
 with Ada.Characters.Handling; use Ada.Characters.Handling;
+with Ada.Command_Line;        use Ada.Command_Line;
 with Ada.Exceptions;          use Ada.Exceptions;
 with Ada.Strings.Fixed;       use Ada.Strings.Fixed;
 with Ada.Text_IO;             use Ada.Text_IO;
@@ -52,7 +54,7 @@ procedure XOSCons is
    use ASCII;
    use Ada.Strings;
 
-   Unit_Name : constant String := "s-oscons";
+   Unit_Name : constant String := Argument (1);
    Tmpl_Name : constant String := Unit_Name & "-tmplt";
 
    -------------------------------------------------
@@ -559,4 +561,7 @@ begin
 
    Close (Tmpl_File);
 
+exception
+   when others =>
+      Put_Line ("xoscons <base_name>");
 end XOSCons;