From 579847c27262b011e96575c8ac74d0aa118152f0 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Tue, 21 Jan 2014 13:02:54 +0100 Subject: [multiple changes] 2014-01-21 Robert Dewar * exp_aggr.adb: Minor reformatting. 2014-01-21 Johannes Kanig * gnat1drv.adb (Gnat1drv) remove obsolete reference to -gnatd.H. 2014-01-21 Bob Duff * gnat_ugn.texi: Document the "checks" attribute in gnat2xml. 2014-01-21 Steve Baird * gnat_rm.texi: Improve description of SPARK_Mode pragma. 2014-01-21 Vincent Celier * prj-part.adb (Parse_Single_Project): Accept to extend a project if it has only be imported by an project being extended. When a project that has only been imported by a project being extended is imported by another project that is not being extended, reset the previous indication, so that it will be an error if this project is extended later. * prj-tree.adb (Create_Project): Include component From_Extended in table Projects_HT * prj-tree.ads (Project_Name_And_Node): New Boolean component From_Extended 2014-01-21 Robert Dewar * atree.ads, atree.adb: Add Node33 and Set_Node33. * einfo.ads, einfo.adb (SPARK_Pragma): New field (SPARK_Aux_Pragma): New field (SPARK_Pragma_Inherited): New flag (SPARK_Aux_Pragma_Inherited): New flag (SPARK_Mode_Pragmas): Removed. * lib.ads, lib.adb: Remove SPARK_Mode_Pragma, no longer used. * opt.ads (SPARK_Mode_Pragma): New global variable. * sem.ads: Add Save_SPARK_Mode_Pragma field to Scope_Stack_Entry. * sem_ch3.adb: Use new SPARK_Mode data structures. * sem_ch6.adb: Set SPARK_Mode fields in subprogram specs and bodies. * sem_ch7.adb: Set SPARK_Mode fields in package spec and body entities. * sem_ch8.adb (Push_Scope): Save SPARK_Mode_Pragma. (Pop_Scope): Restore SPARK_Mode_Pragma. * sem_prag.adb (Analyze_Pragma, case SPARK_Mode): Rewrite for new data structures. 2014-01-21 Arnaud Charlet * back_end.adb: Undo previous change, not needed. Minor reformatting. From-SVN: r206879 --- gcc/ada/back_end.adb | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) (limited to 'gcc/ada/back_end.adb') diff --git a/gcc/ada/back_end.adb b/gcc/ada/back_end.adb index 89cf303..0b8920d 100644 --- a/gcc/ada/back_end.adb +++ b/gcc/ada/back_end.adb @@ -183,7 +183,6 @@ package body Back_End is ----------------------------- procedure Scan_Compiler_Arguments is - Next_Arg : Positive; -- Next argument to be scanned @@ -247,7 +246,6 @@ package body Back_End is elsif Switch_Chars (First .. Last) = "fdump-scos" then Opt.Generate_SCO := True; Opt.Generate_SCO_Instance_Table := True; - end if; end if; end Scan_Back_End_Switches; @@ -255,7 +253,7 @@ package body Back_End is -- Local variables Arg_Count : constant Natural := Natural (save_argc - 1); - Args : Argument_List (1 .. Arg_Count); + Args : Argument_List (1 .. Arg_Count); -- Start of processing for Scan_Compiler_Arguments @@ -271,7 +269,7 @@ package body Back_End is Argv_Ptr : constant Big_String_Ptr := save_argv (Arg); Argv_Len : constant Nat := Len_Arg (Arg); Argv : constant String := - Argv_Ptr (1 .. Natural (Argv_Len)); + Argv_Ptr (1 .. Natural (Argv_Len)); begin Args (Positive (Arg)) := new String'(Argv); end; @@ -289,20 +287,9 @@ package body Back_End is -- flag (that is we have seen a -gnatO), then the next argument -- is the name of the output object file. - if Output_File_Name_Present - and then not Output_File_Name_Seen - then + if Output_File_Name_Present and then not Output_File_Name_Seen then if Is_Switch (Argv) then Fail ("Object file name missing after -gnatO"); - - -- In GNATprove_Mode, such an object file is never written, and - -- the call to Set_Output_Object_File_Name may fail (e.g. when - -- the object file name does not have the expected suffix). So - -- we skip that call when GNATprove_Mode is set. - - elsif GNATprove_Mode then - Output_File_Name_Seen := True; - else Set_Output_Object_File_Name (Argv); Output_File_Name_Seen := True; @@ -320,7 +307,9 @@ package body Back_End is Search_Directory_Present := False; end if; - elsif not Is_Switch (Argv) then -- must be a file name + -- If not a switch, must be a file name + + elsif not Is_Switch (Argv) then Add_File (Argv); -- We must recognize -nostdinc to suppress visibility on the -- cgit v1.1