diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2010-10-04 15:53:10 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2010-10-04 15:53:10 +0200 |
| commit | f5d96d00381bbdf2f14e03e89966de624c2f293b (patch) | |
| tree | 7ae55711277fcb735520f67dfdc77c9f5ac69055 | |
| parent | 39eb65425dcfa87ebbd42cd7f9091b13fef281ee (diff) | |
| download | gcc-f5d96d00381bbdf2f14e03e89966de624c2f293b.zip gcc-f5d96d00381bbdf2f14e03e89966de624c2f293b.tar.gz gcc-f5d96d00381bbdf2f14e03e89966de624c2f293b.tar.bz2 | |
[multiple changes]
2010-10-04 Robert Dewar <dewar@adacore.com>
* s-taprop-vxworks.adb, sem_res.adb: Minor reformatting.
2010-10-04 Javier Miranda <miranda@adacore.com>
* exp_cg.adb (Write_Call_Info): Code clean up.
From-SVN: r164938
| -rw-r--r-- | gcc/ada/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/ada/exp_cg.adb | 9 | ||||
| -rw-r--r-- | gcc/ada/s-taprop-vxworks.adb | 5 | ||||
| -rw-r--r-- | gcc/ada/sem_res.adb | 12 |
4 files changed, 23 insertions, 11 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index b389fed..cf85151 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,11 @@ +2010-10-04 Robert Dewar <dewar@adacore.com> + + * s-taprop-vxworks.adb, sem_res.adb: Minor reformatting. + +2010-10-04 Javier Miranda <miranda@adacore.com> + + * exp_cg.adb (Write_Call_Info): Code clean up. + 2010-10-04 Arnaud Charlet <charlet@adacore.com> * s-taprop-mingw.adb (Create_Task): Initialize Thread_Id field to 0. diff --git a/gcc/ada/exp_cg.adb b/gcc/ada/exp_cg.adb index 6db3929..1addb94 100644 --- a/gcc/ada/exp_cg.adb +++ b/gcc/ada/exp_cg.adb @@ -579,9 +579,14 @@ package body Exp_CG is Prim := Node (Elmt); -- Skip internal entities associated with overridden interface - -- primitives + -- primitives, and also inherited primitives. - if Present (Interface_Alias (Prim)) then + if Present (Interface_Alias (Prim)) + or else + (Present (Alias (Prim)) + and then Find_Dispatching_Type (Prim) + /= Find_Dispatching_Type (Alias (Prim))) + then goto Continue; end if; diff --git a/gcc/ada/s-taprop-vxworks.adb b/gcc/ada/s-taprop-vxworks.adb index 7380edd..d5726ec 100644 --- a/gcc/ada/s-taprop-vxworks.adb +++ b/gcc/ada/s-taprop-vxworks.adb @@ -1099,9 +1099,9 @@ package body System.Task_Primitives.Operations is Result : STATUS; begin - -- Set_True can be called from an interrupt context, in which case -- Abort_Defer is undefined. + if Is_Task_Context then SSL.Abort_Defer.all; end if; @@ -1129,6 +1129,7 @@ package body System.Task_Primitives.Operations is -- Set_True can be called from an interrupt context, in which case -- Abort_Undefer is undefined. + if Is_Task_Context then SSL.Abort_Undefer.all; end if; @@ -1336,9 +1337,9 @@ package body System.Task_Primitives.Operations is function Is_Task_Context return Boolean is function intContext return int; + pragma Import (C, intContext, "intContext"); -- Binding to the C routine intContext. This function returns 1 only -- if the current execution state is an interrupt context. - pragma Import (C, intContext, "intContext"); begin return intContext /= 1; end Is_Task_Context; diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb index 23107cb..54c317a 100644 --- a/gcc/ada/sem_res.adb +++ b/gcc/ada/sem_res.adb @@ -8856,13 +8856,11 @@ package body Sem_Res is -- newer language version. elsif Nkind (Orig_N) = N_Qualified_Expression - and then Nkind_In - (Parent (N), - N_Attribute_Reference, - N_Indexed_Component, - N_Selected_Component, - N_Slice, - N_Explicit_Dereference) + and then Nkind_In (Parent (N), N_Attribute_Reference, + N_Indexed_Component, + N_Selected_Component, + N_Slice, + N_Explicit_Dereference) then null; |