From ef5569c64bdbf0cdce0d1bf8a91edb825e5e413f Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Thu, 4 Aug 2011 15:22:36 +0200 Subject: [PATCH] [multiple changes] 2011-08-04 Emmanuel Briot * make.adb, osint.adb, osint.ads (Reset_Command_Line_Files): not used after all, so removed. 2011-08-04 Sergey Rybin * vms_data.ads: Add missing VMS qualifiers. From-SVN: r177381 --- gcc/ada/ChangeLog | 9 +++++++++ gcc/ada/make.adb | 3 --- gcc/ada/osint.adb | 9 --------- gcc/ada/osint.ads | 3 --- gcc/ada/vms_data.ads | 43 +++++++++++++++++++++++++------------------ 5 files changed, 34 insertions(+), 33 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 12e4b0d54b3..7112facf76d 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,12 @@ +2011-08-04 Emmanuel Briot + + * make.adb, osint.adb, osint.ads (Reset_Command_Line_Files): not used + after all, so removed. + +2011-08-04 Sergey Rybin + + * vms_data.ads: Add missing VMS qualifiers. + 2011-08-04 Emmanuel Briot * make.adb, makeutl.adb, osint.adb, osint.ads (Check_Mains): rebuild diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb index 41e787d3192..dd9e9b9c2ee 100644 --- a/gcc/ada/make.adb +++ b/gcc/ada/make.adb @@ -5540,9 +5540,6 @@ package body Make is -- queue as gprbuild and processes the file directly on the queue. Mains.Reset; - -- Osint.Reset_Command_Line_Files; - Debug_Output ("Reseting list of mains on the command line"); - loop Info := Mains.Next_Main; exit when Info = No_Main_Info; diff --git a/gcc/ada/osint.adb b/gcc/ada/osint.adb index 408384ca88b..8da01c2468a 100644 --- a/gcc/ada/osint.adb +++ b/gcc/ada/osint.adb @@ -2749,15 +2749,6 @@ package body Osint is return new String'(Path); end Relocate_Path; - ------------------------------ - -- Reset_Command_Line_Files -- - ------------------------------ - - procedure Reset_Command_Line_Files is - begin - Number_File_Names := 0; - end Reset_Command_Line_Files; - ----------------- -- Set_Program -- ----------------- diff --git a/gcc/ada/osint.ads b/gcc/ada/osint.ads index 9fccd330859..a4fc33412e4 100644 --- a/gcc/ada/osint.ads +++ b/gcc/ada/osint.ads @@ -114,9 +114,6 @@ package Osint is function Number_Of_Files return Int; -- Gives the total number of filenames found on the command line - procedure Reset_Command_Line_Files; - -- Reset the list of files specified on the command line to empty. - No_Index : constant := -1; -- Value used in Add_File to indicate no index is specified for main diff --git a/gcc/ada/vms_data.ads b/gcc/ada/vms_data.ads index 75fd41485d3..3e232795c03 100644 --- a/gcc/ada/vms_data.ads +++ b/gcc/ada/vms_data.ads @@ -882,6 +882,12 @@ package VMS_Data is -- of the directory specified in the project file. If the subdirectory -- does not exist, it is created automatically. + S_Check_Template : aliased constant S := "/TEMPLATE=@" & + "--write-rules=@"; + -- /TEMPLATE=filename + -- + -- Generate the rule template into the specified file. + S_Check_Verb : aliased constant S := "/VERBOSE " & "-v"; -- /NOVERBOSE (D) @@ -898,24 +904,25 @@ package VMS_Data is -- Specify the name of the output file. Check_Switches : aliased constant Switches := - (S_Check_Add 'Access, - S_Check_All 'Access, - S_Diagnosis 'Access, - S_Check_Ext 'Access, - S_Check_Files 'Access, - S_Check_Follow 'Access, - S_Check_Help 'Access, - S_Check_Locs 'Access, - S_Check_Mess 'Access, - S_Check_Project'Access, - S_Check_Quiet 'Access, - S_Check_Time 'Access, - S_Check_Log 'Access, - S_Check_Short 'Access, - S_Check_Include'Access, - S_Check_Subdirs'Access, - S_Check_Verb 'Access, - S_Check_Out 'Access); + (S_Check_Add 'Access, + S_Check_All 'Access, + S_Diagnosis 'Access, + S_Check_Ext 'Access, + S_Check_Files 'Access, + S_Check_Follow 'Access, + S_Check_Help 'Access, + S_Check_Locs 'Access, + S_Check_Mess 'Access, + S_Check_Project 'Access, + S_Check_Quiet 'Access, + S_Check_Time 'Access, + S_Check_Log 'Access, + S_Check_Short 'Access, + S_Check_Include 'Access, + S_Check_Subdirs 'Access, + S_Check_Template'Access, + S_Check_Verb 'Access, + S_Check_Out 'Access); ---------------------------- -- Switches for GNAT CHOP -- -- 2.30.2