From: Arnaud Charlet Date: Wed, 7 Jan 2015 08:55:01 +0000 (+0100) Subject: [multiple changes] X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=95e0ceefa50376f3135861b8ecfae1c89c540563;p=gcc.git [multiple changes] 2015-01-07 Arnaud Charlet * s-osinte-vxworks.adb, s-osinte-vxworks.ads (sigwait, sigwaitinfo): Removed, not needed after all on any VxWorks configurations. 2015-01-07 Robert Dewar * sem_ch3.adb, freeze.adb, exp_disp.adb: Minor reformatting. From-SVN: r219284 --- diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index b45007bd6f8..03edfd042d1 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,13 @@ +2015-01-07 Arnaud Charlet + + * s-osinte-vxworks.adb, s-osinte-vxworks.ads + (sigwait, sigwaitinfo): Removed, not needed after all on any + VxWorks configurations. + +2015-01-07 Robert Dewar + + * sem_ch3.adb, freeze.adb, exp_disp.adb: Minor reformatting. + 2015-01-07 Javier Miranda * exp_disp.adb (Expand_Interface_Conversion): Adding missing diff --git a/gcc/ada/exp_disp.adb b/gcc/ada/exp_disp.adb index 4d07a3752bf..c0613bb80ce 100644 --- a/gcc/ada/exp_disp.adb +++ b/gcc/ada/exp_disp.adb @@ -1423,15 +1423,15 @@ package body Exp_Disp is if Is_Access_Type (Etype (Expression (N))) then Apply_Accessibility_Check - (N => Expression (N), - Typ => Etype (N), + (N => Expression (N), + Typ => Etype (N), Insert_Node => N); -- Generate: Func (Address!(Expression)) Rewrite (N, Make_Function_Call (Loc, - Name => New_Occurrence_Of (Fent, Loc), + Name => New_Occurrence_Of (Fent, Loc), Parameter_Associations => New_List ( Unchecked_Convert_To (RTE (RE_Address), Relocate_Node (Expression (N)))))); @@ -1441,7 +1441,7 @@ package body Exp_Disp is Rewrite (N, Make_Function_Call (Loc, - Name => New_Occurrence_Of (Fent, Loc), + Name => New_Occurrence_Of (Fent, Loc), Parameter_Associations => New_List ( Make_Attribute_Reference (Loc, Prefix => Unchecked_Convert_To (Operand_Typ, diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb index ab128f242b7..f14855d247e 100644 --- a/gcc/ada/freeze.adb +++ b/gcc/ada/freeze.adb @@ -7800,17 +7800,17 @@ package body Freeze is if (SSO_Set_Low_By_Default (T) or else SSO_Set_High_By_Default (T)) - -- For a record type, if bit order is specified explicitly, then - -- do not set SSO from default if not consistent. Note that we - -- do not want to look at a Bit_Order attribute definition for - -- a parent: if we were to inherit Bit_Order, then both + -- For a record type, if bit order is specified explicitly, + -- then do not set SSO from default if not consistent. Note that + -- we do not want to look at a Bit_Order attribute definition + -- for a parent: if we were to inherit Bit_Order, then both -- SSO_Set_*_By_Default flags would have been cleared already -- (by Inherit_Aspects_At_Freeze_Point). and then not (Is_Record_Type (T) - and then Has_Rep_Item (T, - Name_Bit_Order, Check_Parents => False) + and then + Has_Rep_Item (T, Name_Bit_Order, Check_Parents => False) and then Reverse_Bit_Order (T) /= Reversed) then -- If flags cause reverse storage order, then set the result. Note diff --git a/gcc/ada/s-osinte-vxworks.adb b/gcc/ada/s-osinte-vxworks.adb index 81aa7a9d9ed..ab56b8c7d5b 100644 --- a/gcc/ada/s-osinte-vxworks.adb +++ b/gcc/ada/s-osinte-vxworks.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1997-2011, Free Software Foundation, Inc. -- +-- Copyright (C) 1997-2014, Free Software Foundation, Inc. -- -- -- -- GNARL is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -45,32 +45,6 @@ package body System.OS_Interface is Low_Priority : constant := 255; -- VxWorks native (default) lowest scheduling priority - ------------- - -- sigwait -- - ------------- - - function sigwait - (set : access sigset_t; - sig : access Signal) return int - is - Result : int; - - function sigwaitinfo - (set : access sigset_t; sigvalue : System.Address) return int; - pragma Import (C, sigwaitinfo, "sigwaitinfo"); - - begin - Result := sigwaitinfo (set, System.Null_Address); - - if Result /= -1 then - sig.all := Signal (Result); - return OK; - else - sig.all := 0; - return errno; - end if; - end sigwait; - ----------------- -- To_Duration -- ----------------- diff --git a/gcc/ada/s-osinte-vxworks.ads b/gcc/ada/s-osinte-vxworks.ads index 3509ecd4d1a..0193284330d 100644 --- a/gcc/ada/s-osinte-vxworks.ads +++ b/gcc/ada/s-osinte-vxworks.ads @@ -192,9 +192,6 @@ package System.OS_Interface is function c_signal (sig : Signal; handler : isr_address) return isr_address; pragma Import (C, c_signal, "signal"); - function sigwait (set : access sigset_t; sig : access Signal) return int; - pragma Inline (sigwait); - function pthread_sigmask (how : int; set : access sigset_t; diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb index 7757d6dda86..51083e37f92 100644 --- a/gcc/ada/sem_ch3.adb +++ b/gcc/ada/sem_ch3.adb @@ -15860,8 +15860,8 @@ package body Sem_Ch3 is Taggd := Is_Tagged_Type (Parent_Type); - -- Set the parent type to the class-wide type's specific type - -- in this case to prevent cascading errors + -- Set the parent type to the class-wide type's specific type in this + -- case to prevent cascading errors if Present (Extension) and then Is_Class_Wide_Type (Parent_Type) then Error_Msg_N ("parent type must not be a class-wide type", Indic); @@ -15913,7 +15913,7 @@ package body Sem_Ch3 is begin if Nkind (Decl) = N_Formal_Type_Declaration and then Nkind (Formal_Type_Definition (Decl)) = - N_Formal_Derived_Type_Definition + N_Formal_Derived_Type_Definition and then Synchronized_Present (Formal_Type_Definition (Decl)) and then No (Extension) @@ -15988,9 +15988,7 @@ package body Sem_Ch3 is procedure Diagnose_Interface (N : Node_Id; E : Entity_Id) is begin - if not Is_Interface (E) - and then E /= Any_Type - then + if not Is_Interface (E) and then E /= Any_Type then Error_Msg_NE ("(Ada 2005) & must be an interface", N, E); end if; end Diagnose_Interface; @@ -16234,8 +16232,7 @@ package body Sem_Ch3 is while Present (F_Spec) loop P_Spec := First (Prev_Aspects); while Present (P_Spec) loop - if - Chars (Identifier (P_Spec)) = Chars (Identifier (F_Spec)) + if Chars (Identifier (P_Spec)) = Chars (Identifier (F_Spec)) then Error_Msg_N ("aspect already specified in private declaration", @@ -16547,9 +16544,7 @@ package body Sem_Ch3 is elsif Nkind_In (N, N_Task_Type_Declaration, N_Protected_Type_Declaration) then - if No (Interface_List (N)) - and then not Error_Posted (N) - then + if No (Interface_List (N)) and then not Error_Posted (N) then Tag_Mismatch; end if; @@ -16856,6 +16851,7 @@ package body Sem_Ch3 is -- Check that requested number of digits is not too high. if Digs_Val > Max_Digs_Val then + -- The check for Max_Base_Digits may be somewhat expensive, as it -- requires reading System, so only do it when necessary. @@ -17105,16 +17101,16 @@ package body Sem_Ch3 is Result_Entity := Entity (Result); end if; - -- See if this level of derivation actually has discriminants - -- because tagged derivations can add them, hence the lower - -- levels need not have any. + -- See if this level of derivation actually has discriminants because + -- tagged derivations can add them, hence the lower levels need not + -- have any. if not Has_Discriminants (Ti) then return Result; end if; - -- Scan Ti's discriminants for Result_Entity, - -- and return its corresponding value, if any. + -- Scan Ti's discriminants for Result_Entity, and return its + -- corresponding value, if any. Result_Entity := Original_Record_Component (Result_Entity); @@ -17143,7 +17139,7 @@ package body Sem_Ch3 is end loop; -- Could not find it - -- + return Result; end Search_Derivation_Levels; @@ -17471,8 +17467,8 @@ package body Sem_Ch3 is and then not Is_Tagged and then (not Inherit_Discr - or else First_Discriminant (Parent_Base) /= - First_Stored_Discriminant (Parent_Base)) + or else First_Discriminant (Parent_Base) /= + First_Stored_Discriminant (Parent_Base)) then Stored_Discrim := First_Stored_Discriminant (Parent_Base); while Present (Stored_Discrim) loop @@ -17650,6 +17646,7 @@ package body Sem_Ch3 is end loop; return True; + else return True; end if; @@ -18265,9 +18262,7 @@ package body Sem_Ch3 is Init_Esize (T, System_Max_Binary_Modulus_Power); end if; - if not Non_Binary_Modulus (T) - and then Esize (T) = RM_Size (T) - then + if not Non_Binary_Modulus (T) and then Esize (T) = RM_Size (T) then Set_Is_Known_Valid (T); end if; end Set_Modular_Size; @@ -18979,9 +18974,9 @@ package body Sem_Ch3 is null; else - Error_Msg_N ("access discriminants of nonlimited types", - Expression (Discr)); - Error_Msg_N ("\cannot have defaults", Expression (Discr)); + Error_Msg_N + ("access discriminants of nonlimited types cannot " + & "have defaults", Expression (Discr)); end if; elsif Present (Expression (Discr)) then