OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[multiple changes]

Browse Source 
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
This commit is contained in:
Arnaud Charlet 2012-10-29 12:56:46 +01:00
parent 29dd4e883e
commit 5f41168186
5 changed files with 659 additions and 621 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gcc/ada/ChangeLog
View File

@ -1,3 +1,14 @@
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.

2
gcc/ada/Make-generated.in
View File

@ -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

11
gcc/ada/exp_dbug.adb
View File

@ -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

1241
gcc/ada/gcc-interface/Make-lang.in
View File

File diff suppressed because it is too large Load Diff

15
gcc/ada/xoscons.adb
View File

@ -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;