diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2010-09-09 12:19:19 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2010-09-09 12:19:19 +0200 |
| commit | 099ace5e09a8e7c350cf3c1d0e223db247552eeb (patch) | |
| tree | d9eb43cb807504555659b45afdeaad845d94b7ef | |
| parent | 02954c2552424aa9eb56cb613df48c07c8fc6b87 (diff) | |
| download | gcc-099ace5e09a8e7c350cf3c1d0e223db247552eeb.zip gcc-099ace5e09a8e7c350cf3c1d0e223db247552eeb.tar.gz gcc-099ace5e09a8e7c350cf3c1d0e223db247552eeb.tar.bz2 | |
[multiple changes]
2010-09-09 Robert Dewar <dewar@adacore.com>
* sem_util.adb: Minor reformatting
2010-09-09 Vincent Celier <celier@adacore.com>
* vms_data.ads: Add documentation for S_Make_Single.
From-SVN: r164068
| -rw-r--r-- | gcc/ada/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/ada/sem_util.adb | 30 | ||||
| -rw-r--r-- | gcc/ada/vms_data.ads | 5 |
3 files changed, 29 insertions, 14 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index eba59bd..914e967 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,11 @@ +2010-09-09 Robert Dewar <dewar@adacore.com> + + * sem_util.adb: Minor reformatting + +2010-09-09 Vincent Celier <celier@adacore.com> + + * vms_data.ads: Add documentation for S_Make_Single. + 2010-09-09 Ed Schonberg <schonberg@adacore.com> * sem_util.adb (Same_Object): include formal parameters. diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 559373b..83fee32 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -6572,7 +6572,7 @@ package body Sem_Util is -- the corresponding procedure has been created, and which therefore do -- not have an assigned scope. - if Ekind (E) in Formal_Kind then + if Is_Formal (E) then return False; end if; @@ -10532,22 +10532,24 @@ package body Sem_Util is begin -- First case, both are entities with same entity - if K1 in N_Has_Entity - and then K2 in N_Has_Entity - and then Present (Entity (N1)) - and then Present (Entity (N2)) - and then (Ekind (Entity (N1)) = E_Variable - or else - Ekind (Entity (N1)) = E_Constant - or else - Ekind (Entity (N1)) in Formal_Kind) - and then Entity (N1) = Entity (N2) - then - return True; + if K1 in N_Has_Entity and then K2 in N_Has_Entity then + declare + EN1 : constant Entity_Id := Entity (N1); + EN2 : constant Entity_Id := Entity (N2); + begin + if Present (EN1) and then Present (EN2) + and then (Ekind_In (EN1, E_Variable, E_Constant) + or else Is_Formal (EN1)) + and then EN1 = EN2 + then + return True; + end if; + end; + end if; -- Second case, selected component with same selector, same record - elsif K1 = N_Selected_Component + if K1 = N_Selected_Component and then K2 = N_Selected_Component and then Chars (Selector_Name (N1)) = Chars (Selector_Name (N2)) then diff --git a/gcc/ada/vms_data.ads b/gcc/ada/vms_data.ads index d9a290f..5477dea 100644 --- a/gcc/ada/vms_data.ads +++ b/gcc/ada/vms_data.ads @@ -4860,6 +4860,11 @@ package VMS_Data is S_Make_Single : aliased constant S := "/SINGLE_COMPILE_PER_OBJ_DIR " & "--single-compile-per-obj-dir"; + -- /NOSINGLE_COMPILE_PER_OBJ_DIR (D) + -- /SINGLE_COMPILE_PER_OBJ_DIR + -- + -- When project files are used, do not allow simultaneous compilations + -- for the same object directory. S_Make_Skip : aliased constant S := "/SKIP_MISSING=*" & "-aL*"; |