From: charlet Date: Mon, 23 Jul 2012 07:31:47 +0000 (+0000) Subject: 2012-07-23 Robert Dewar X-Git-Tag: upstream/4.9.2~11510 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c7dbb79e9c8b9c4e6a0d3e528908a33e117fd537;p=platform%2Fupstream%2Flinaro-gcc.git 2012-07-23 Robert Dewar * layout.adb, sem_prag.adb, sem.ads, freeze.adb, switch-m.adb, exp_disp.adb, system-vxworks-ppc.ads, exp_ch6.adb: Minor reformatting. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@189770 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index b188a62..4df535b 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2012-07-23 Robert Dewar + + * layout.adb, sem_prag.adb, sem.ads, freeze.adb, + switch-m.adb, exp_disp.adb, system-vxworks-ppc.ads, exp_ch6.adb: Minor + reformatting. + 2012-07-23 Tristan Gingold * gcc-interface/trans.c: (Handled_Sequence_Of_Statements_to_gnu): Set diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb index bbf2126..8692781 100644 --- a/gcc/ada/exp_ch6.adb +++ b/gcc/ada/exp_ch6.adb @@ -4835,8 +4835,8 @@ package body Exp_Ch6 is Ret_Type := Etype (Subp); end if; - -- Create temporaries for the actuals that are expressions, or that - -- are scalars and require copying to preserve semantics. + -- Create temporaries for the actuals that are expressions, or that are + -- scalars and require copying to preserve semantics. F := First_Formal (Subp); A := First_Actual (N); @@ -4850,9 +4850,7 @@ package body Exp_Ch6 is -- prevent spurious warnings about overwriting for assignments to the -- formal in the inlined code. - if Is_Entity_Name (A) - and then Ekind (F) /= E_In_Parameter - then + if Is_Entity_Name (A) and then Ekind (F) /= E_In_Parameter then Set_Last_Assignment (Entity (A), Empty); end if; @@ -4888,9 +4886,9 @@ package body Exp_Ch6 is (not Is_Scalar_Type (Etype (A)) or else Ekind (Entity (A)) = E_Enumeration_Literal)) - -- When the actual is an identifier and the corresponding formal - -- is used only once in the original body, the formal can be - -- substituted directly with the actual parameter. + -- When the actual is an identifier and the corresponding formal is + -- used only once in the original body, the formal can be substituted + -- directly with the actual parameter. or else (Nkind (A) = N_Identifier and then Formal_Is_Used_Once (F)) @@ -4936,8 +4934,8 @@ package body Exp_Ch6 is Set_Sloc (New_A, Sloc (N)); - -- If the actual has a by-reference type, it cannot be copied, so - -- its value is captured in a renaming declaration. Otherwise + -- If the actual has a by-reference type, it cannot be copied, + -- so its value is captured in a renaming declaration. Otherwise -- declare a local constant initialized with the actual. -- We also use a renaming declaration for expressions of an array @@ -5161,8 +5159,8 @@ package body Exp_Ch6 is end if; end if; - -- Analyze Blk with In_Inlined_Body set, to avoid spurious errors on - -- conflicting private views that Gigi would ignore. If this is a + -- Analyze Blk with In_Inlined_Body set, to avoid spurious errors + -- on conflicting private views that Gigi would ignore. If this is a -- predefined unit, analyze with checks off, as is done in the non- -- inlined run-time units. diff --git a/gcc/ada/exp_disp.adb b/gcc/ada/exp_disp.adb index 98ecf0d..f248282 100644 --- a/gcc/ada/exp_disp.adb +++ b/gcc/ada/exp_disp.adb @@ -7132,7 +7132,10 @@ package body Exp_Disp is Set_Related_Type (DT_Ptr, Typ); -- Ensure that entities Prim_Ptr and Predef_Prims_Table_Ptr have - -- the decoration required by the backend + -- the decoration required by the backend. + + -- Odd comment, the back end cannot require anything not properly + -- documented in einfo! ??? Set_Is_Dispatch_Table_Entity (RTE (RE_Prim_Ptr)); Set_Is_Dispatch_Table_Entity (RTE (RE_Predef_Prims_Table_Ptr)); diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb index cd106fc..a65f0b1 100644 --- a/gcc/ada/freeze.adb +++ b/gcc/ada/freeze.adb @@ -3031,6 +3031,8 @@ package body Freeze is -- the corresponding body, and therefore are not checked on an -- imported subprogram for which the body is not available. + -- Could consider generating a wrapper to take care of this??? + if Is_Subprogram (E) and then Is_Imported (E) and then Present (Contract (E)) diff --git a/gcc/ada/layout.adb b/gcc/ada/layout.adb index cacc461..d83a6e2 100644 --- a/gcc/ada/layout.adb +++ b/gcc/ada/layout.adb @@ -2460,15 +2460,14 @@ package body Layout is elsif AAMP_On_Target and then ((Ekind (E) = E_Access_Subprogram_Type - and then Present (Enclosing_Subprogram (E))) - or else - (Ekind (E) = E_Anonymous_Access_Subprogram_Type - and then - (not Is_Local_Anonymous_Access (E) - or else Present (Enclosing_Subprogram (E))))) + and then Present (Enclosing_Subprogram (E))) + or else + (Ekind (E) = E_Anonymous_Access_Subprogram_Type + and then + (not Is_Local_Anonymous_Access (E) + or else Present (Enclosing_Subprogram (E))))) then Init_Size (E, 2 * System_Address_Size); - else Init_Size (E, System_Address_Size); end if; diff --git a/gcc/ada/sem.ads b/gcc/ada/sem.ads index 00babf3..7f20eaf 100644 --- a/gcc/ada/sem.ads +++ b/gcc/ada/sem.ads @@ -449,7 +449,7 @@ package Sem is -- Pointer to name of last subprogram body in this scope. Used for -- testing proper alpha ordering of subprogram bodies in scope. - Save_Scope_Suppress : Suppress_Array; + Save_Scope_Suppress : Suppress_Array; -- Save contents of Scope_Suppress on entry Save_Local_Suppress_Stack_Top : Suppress_Stack_Entry_Ptr; diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index 87fd152..372ad8e 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -5620,9 +5620,7 @@ package body Sem_Prag is -- If this is a first subtype, and the base type is distinct, -- then also set the suppress flags on the base type. - if Is_First_Subtype (E) - and then Etype (E) /= E - then + if Is_First_Subtype (E) and then Etype (E) /= E then Suppress_Unsuppress_Echeck (Etype (E), C); end if; end Suppress_Unsuppress_Echeck; diff --git a/gcc/ada/switch-m.adb b/gcc/ada/switch-m.adb index ea3b586..81211db 100644 --- a/gcc/ada/switch-m.adb +++ b/gcc/ada/switch-m.adb @@ -236,9 +236,9 @@ package body Switch.M is -- One-letter switches when 'a' | 'A' | 'b' | 'B' | 'c' | 'C' | 'E' | 'f' | - 'F' | 'g' | 'h' | 'H' | 'I' | 'L' | 'N' | - 'o' | 'p' | 'P' | 'q' | 'Q' | 'r' | 's' | 'S' | - 't' | 'u' | 'U' | 'v' | 'x' | 'X' | 'Z' => + 'F' | 'g' | 'h' | 'H' | 'I' | 'L' | 'N' | 'o' | + 'p' | 'P' | 'q' | 'Q' | 'r' | 's' | 'S' | 't' | + 'u' | 'U' | 'v' | 'x' | 'X' | 'Z' => Storing (First_Stored) := C; Add_Switch_Component (Storing (Storing'First .. First_Stored)); diff --git a/gcc/ada/system-vxworks-ppc.ads b/gcc/ada/system-vxworks-ppc.ads index c1e85b2..8ccc9b8 100644 --- a/gcc/ada/system-vxworks-ppc.ads +++ b/gcc/ada/system-vxworks-ppc.ads @@ -115,6 +115,12 @@ package System is private + -- Note: we are moving to a scheme where we more closely rely on the + -- VxWorks mechanisms to register exception tables. This change requests + -- it by default (-auto-register) and removes the incomplete circuitry + -- that was taking care of the registration as part of the Ada RTS + -- initialization. + pragma Linker_Options ("-crtbe" & ASCII.NUL & "-auto-register"); -- Required by ZCX on VxWorks kernel