diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-04-11 09:31:53 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-04-11 09:31:53 +0000 |
| commit | 8fa4b2980bd08af799e33bf24d06714e5a558d3d (patch) | |
| tree | ddb6615dde6578ad9a5716a43b0cfd7e81e1672d /gcc/ada/makeutl.adb | |
| parent | 6c1f6b490fa53f3bcfb99e81d453378539ef5b53 (diff) | |
| download | gcc-8fa4b2980bd08af799e33bf24d06714e5a558d3d.tar.gz | |
2013-04-11 Robert Dewar <dewar@adacore.com>
* s-osprim-mingw.adb, sem_ch3.adb, sem_prag.adb, sem_util.adb.
makeutl.adb, sem_ch8.adb: Minor reformatting.
2013-04-11 Vincent Celier <celier@adacore.com>
* gnat_ugn.texi: Minor fixes for VMS.
* ug_words: Minor addition: -gnato? => /OVERFLOW_CHECKS=?.
2013-04-11 Robert Dewar <dewar@adacore.com>
* usage.adb (Usage): Minor edit to -gnatW message
2013-04-11 Robert Dewar <dewar@adacore.com>
* exp_aggr.adb (Expand_N_Aggregate): Add circuit for handling
others for string literal case. Also add big ??? comment about
this new code, which should be redundant, but is not.
* sem_eval.adb (Eval_Concatenation): Handle non-static case
properly (Eval_String_Literal): Handle non-static literal properly
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@197744 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/makeutl.adb')
| -rw-r--r-- | gcc/ada/makeutl.adb | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/gcc/ada/makeutl.adb b/gcc/ada/makeutl.adb index 6d33aaacca7..e2d6b84f6d7 100644 --- a/gcc/ada/makeutl.adb +++ b/gcc/ada/makeutl.adb @@ -369,12 +369,12 @@ package body Makeutl is Status : Boolean; -- For call to Close - Iter : Source_Iterator := - For_Each_Source - (In_Tree => Project_Tree, - Language => Name_Ada, - Encapsulated_Libs => False, - Locally_Removed => False); + Iter : Source_Iterator := For_Each_Source + (In_Tree => Project_Tree, + Language => Name_Ada, + Encapsulated_Libs => False, + Locally_Removed => False); + Source : Prj.Source_Id; begin @@ -431,13 +431,14 @@ package body Makeutl is -- found. if ALI_Name /= No_File then + -- Look in the project and the projects that are extending it -- to find the real ALI file. declare - ALI : constant String := Get_Name_String (ALI_Name); + ALI : constant String := Get_Name_String (ALI_Name); + ALI_Path : Name_Id := No_Name; - ALI_Path : Name_Id := No_Name; begin loop -- For library projects, use the library ALI directory, @@ -462,6 +463,7 @@ package body Makeutl is end loop; if ALI_Path /= No_Name then + -- First line is the unit name Get_Name_String (ALI_Unit); @@ -475,7 +477,7 @@ package body Makeutl is exit when not OK; - -- Second line it the ALI file name + -- Second line is the ALI file name Get_Name_String (ALI_Name); Add_Char_To_Name_Buffer (ASCII.LF); @@ -488,7 +490,7 @@ package body Makeutl is exit when not OK; - -- Third line it the ALI path name + -- Third line is the ALI path name Get_Name_String (ALI_Path); Add_Char_To_Name_Buffer (ASCII.LF); @@ -576,8 +578,9 @@ package body Makeutl is if Sw'Length >= 3 and then (Sw (2) = 'I' or else (not For_Gnatbind - and then (Sw (2) = 'L' - or else Sw (2) = 'A'))) + and then (Sw (2) = 'L' + or else + Sw (2) = 'A'))) then Start := 3; @@ -592,7 +595,7 @@ package body Makeutl is or else Sw (2 .. 3) = "aI" or else - (For_Gnatbind and then Sw (2 .. 3) = "A=")) + (For_Gnatbind and then Sw (2 .. 3) = "A=")) then Start := 4; |