diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2010-10-07 12:35:03 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2010-10-07 12:35:03 +0200 |
| commit | fa8d6f0771c5454f35a4ca2bec88313bc28c0914 (patch) | |
| tree | 0752ff902cfcd1ea1a6901ebc0cf9d7db3f33c2c | |
| parent | 2b48f20d654e47a84e4e39d98833022da9934354 (diff) | |
| download | gcc-fa8d6f0771c5454f35a4ca2bec88313bc28c0914.zip gcc-fa8d6f0771c5454f35a4ca2bec88313bc28c0914.tar.gz gcc-fa8d6f0771c5454f35a4ca2bec88313bc28c0914.tar.bz2 | |
[multiple changes]
2010-10-07 Robert Dewar <dewar@adacore.com>
* gnatcmd.adb, make.adb, prj-nmsc.adb, sem_elab.adb: Minor reformatting
2010-10-07 Arnaud Charlet <charlet@adacore.com>
* exp_ch11.adb (Expand_N_Exception_Declaration): Update comments.
From-SVN: r165088
| -rw-r--r-- | gcc/ada/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/ada/exp_ch11.adb | 3 | ||||
| -rw-r--r-- | gcc/ada/gnatcmd.adb | 9 | ||||
| -rw-r--r-- | gcc/ada/make.adb | 1 | ||||
| -rw-r--r-- | gcc/ada/prj-nmsc.adb | 4 | ||||
| -rw-r--r-- | gcc/ada/sem_elab.adb | 4 |
6 files changed, 22 insertions, 7 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index bc00ea0..c424134 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,13 @@ 2010-10-07 Robert Dewar <dewar@adacore.com> + * gnatcmd.adb, make.adb, prj-nmsc.adb, sem_elab.adb: Minor reformatting + +2010-10-07 Arnaud Charlet <charlet@adacore.com> + + * exp_ch11.adb (Expand_N_Exception_Declaration): Update comments. + +2010-10-07 Robert Dewar <dewar@adacore.com> + * sem_res.adb: Minor reformatting 2010-10-07 Olivier Ramonat <ramonat@adacore.com> diff --git a/gcc/ada/exp_ch11.adb b/gcc/ada/exp_ch11.adb index 2efee39..a5d92a1 100644 --- a/gcc/ada/exp_ch11.adb +++ b/gcc/ada/exp_ch11.adb @@ -1249,7 +1249,8 @@ package body Exp_Ch11 is begin -- There is no expansion needed when compiling for the JVM since the - -- JVM has a built-in exception mechanism. See 4jexcept.ads for details. + -- JVM has a built-in exception mechanism. See cil/gnatlib/a-except.ads + -- for details. if VM_Target /= No_VM then return; diff --git a/gcc/ada/gnatcmd.adb b/gcc/ada/gnatcmd.adb index 4e189e3..fbd2a6f 100644 --- a/gcc/ada/gnatcmd.adb +++ b/gcc/ada/gnatcmd.adb @@ -407,8 +407,13 @@ procedure GNATCmd is (Main).Value), "ci")); - if not Is_Regular_File (File.all) and then - B_Start.all /= "b__" + -- When looking for the .ci file for a binder + -- generated file, look for both b~xxx and b__xxx + -- as gprbuild always uses b__ as the prefix of + -- such files. + + if not Is_Regular_File (File.all) + and then B_Start.all /= "b__" then File := new String' diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb index 567f126..f88de1a 100644 --- a/gcc/ada/make.adb +++ b/gcc/ada/make.adb @@ -1842,7 +1842,6 @@ package body Make is end if; elsif not Read_Only and then Main_Project /= No_Project then - if not Check_Source_Info_In_ALI (ALI, Project_Tree) then ALI := No_ALI_Id; return; diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb index 82c74f5..4914392 100644 --- a/gcc/ada/prj-nmsc.adb +++ b/gcc/ada/prj-nmsc.adb @@ -7624,7 +7624,9 @@ package body Prj.Nmsc is if Id.File /= Replaced_By.File then declare Replacement : constant File_Name_Type := - Replaced_Source_HTable.Get (Tree.Replaced_Sources, Id.File); + Replaced_Source_HTable.Get + (Tree.Replaced_Sources, Id.File); + begin Replaced_Source_HTable.Set (Tree.Replaced_Sources, Id.File, Replaced_By.File); diff --git a/gcc/ada/sem_elab.adb b/gcc/ada/sem_elab.adb index 9af2e5c..73f5b10 100644 --- a/gcc/ada/sem_elab.adb +++ b/gcc/ada/sem_elab.adb @@ -944,8 +944,8 @@ package body Sem_Elab is -- which can happen if the body enclosing the call appears -- itself in a call whose elaboration check is delayed. - if - Nkind_In (N, N_Function_Call, N_Procedure_Call_Statement) + if Nkind_In (N, N_Function_Call, + N_Procedure_Call_Statement) then Set_No_Elaboration_Check (N); end if; |