2013-09-10 Robert Dewar <dewar@adacore.com>

	* gnatbind.adb: Correct starting date in --version string.
	* gnatdll.adb: Use Check_Version_And_Help_G to implement --help
	and --version.
	* gnatkr.adb: Use Check_Version_And_Help_G to implement --help
	and --version.
	* gnatlink.adb: Correct starting date in --version string.
	* gnatls.adb: Correct starting date in --version string.
	* make.adb: Correct starting date in --version string.



git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@202465 138bc75d-0d04-0410-961f-82ee72b054a4

7 files changed, 50 insertions, 15 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 9440fe640d9..b040b31e4c9 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,16 @@
 2013-09-10  Robert Dewar  <dewar@adacore.com>
 
+	* gnatbind.adb: Correct starting date in --version string.
+	* gnatdll.adb: Use Check_Version_And_Help_G to implement --help
+	and --version.
+	* gnatkr.adb: Use Check_Version_And_Help_G to implement --help
+	and --version.
+	* gnatlink.adb: Correct starting date in --version string.
+	* gnatls.adb: Correct starting date in --version string.
+	* make.adb: Correct starting date in --version string.
+
+2013-09-10  Robert Dewar  <dewar@adacore.com>
+
 	* switch-c.adb: Minor reformatting.
 	* atree.ads (Original_Nodes): Add documentation on ASIS usage.
 	* sinfo.ads: Add section on ASIS mode (documentation only).
diff --git a/gcc/ada/gnatbind.adb b/gcc/ada/gnatbind.adb
index 52591c46b07..14afac55386 100644
--- a/gcc/ada/gnatbind.adb
+++ b/gcc/ada/gnatbind.adb
@@ -572,7 +572,7 @@ begin
 
    --  First, scan to detect --version and/or --help
 
-   Check_Version_And_Help ("GNATBIND", "1995");
+   Check_Version_And_Help ("GNATBIND", "1992");
 
    --  We need to Scan_Bind_Args first, to set Verbose_Mode, so we know whether
    --  to Put_Bind_Args.
diff --git a/gcc/ada/gnatdll.adb b/gcc/ada/gnatdll.adb
index 6917e631d08..426c00f58bd 100644
--- a/gcc/ada/gnatdll.adb
+++ b/gcc/ada/gnatdll.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1997-2008, Free Software Foundation, Inc.         --
+--          Copyright (C) 1997-2013, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT 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- --
@@ -26,16 +26,18 @@
 --  GNATDLL is a Windows specific tool for building a DLL.
 --  Both relocatable and non-relocatable DLL's are supported
 
+with Gnatvsn;
+with MDLL.Fil; use MDLL.Fil;
+with MDLL.Utl; use MDLL.Utl;
+with Switch;   use Switch;
+
 with Ada.Text_IO;           use Ada.Text_IO;
 with Ada.Strings.Unbounded; use Ada.Strings.Unbounded;
 with Ada.Exceptions;        use Ada.Exceptions;
 with Ada.Command_Line;      use Ada.Command_Line;
-with GNAT.OS_Lib;           use GNAT.OS_Lib;
-with GNAT.Command_Line;     use GNAT.Command_Line;
-with Gnatvsn;
 
-with MDLL.Fil;              use MDLL.Fil;
-with MDLL.Utl;              use MDLL.Utl;
+with GNAT.OS_Lib;       use GNAT.OS_Lib;
+with GNAT.Command_Line; use GNAT.Command_Line;
 
 procedure Gnatdll is
 
@@ -502,9 +504,13 @@ procedure Gnatdll is
       end loop;
    end Check_Context;
 
+   procedure Check_Version_And_Help is new Check_Version_And_Help_G (Syntax);
+
 --  Start of processing for Gnatdll
 
 begin
+   Check_Version_And_Help ("GNATDLL", "1997");
+
    if Ada.Command_Line.Argument_Count = 0 then
       Help := True;
    else
diff --git a/gcc/ada/gnatkr.adb b/gcc/ada/gnatkr.adb
index 1df692e7b4d..908f08ef667 100644
--- a/gcc/ada/gnatkr.adb
+++ b/gcc/ada/gnatkr.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2007, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2013, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT 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- --
@@ -23,10 +23,13 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
-with Ada.Characters.Handling; use Ada.Characters.Handling;
-with Ada.Command_Line;        use Ada.Command_Line;
 with Gnatvsn;
 with Krunch;
+with Switch;  use Switch;
+
+with Ada.Characters.Handling; use Ada.Characters.Handling;
+with Ada.Command_Line;        use Ada.Command_Line;
+
 with System.IO; use System.IO;
 
 procedure Gnatkr is
@@ -38,13 +41,28 @@ procedure Gnatkr is
 
    function Get_Maximum_File_Name_Length return Integer;
    pragma Import (C, Get_Maximum_File_Name_Length,
-                 "__gnat_get_maximum_file_name_length");
+                  "__gnat_get_maximum_file_name_length");
+
+   procedure Usage;
+   --  Output usage information
+
+   -----------
+   -- Usage --
+   -----------
+
+   procedure Usage is
+   begin
+      Put_Line ("Usage: gnatkr  filename[.extension]  [krunch-count]");
+   end Usage;
+
+   procedure Check_Version_And_Help is new Check_Version_And_Help_G (Usage);
 
 begin
+   Check_Version_And_Help ("GNATKR", "1992");
    Count := Argument_Count;
 
    if Count < 1 or else Count > 2 then
-      Put_Line ("Usage: gnatkr  filename[.extension]  [krunch-count]");
+      Usage;
       raise Exit_Program;
 
    else
diff --git a/gcc/ada/gnatlink.adb b/gcc/ada/gnatlink.adb
index 503c2f7b152..793feb95690 100644
--- a/gcc/ada/gnatlink.adb
+++ b/gcc/ada/gnatlink.adb
@@ -355,7 +355,7 @@ procedure Gnatlink is
    begin
       --  First, check for --version and --help
 
-      Check_Version_And_Help ("GNATLINK", "1995");
+      Check_Version_And_Help ("GNATLINK", "1996");
 
       --  Loop through arguments of gnatlink command
 
diff --git a/gcc/ada/gnatls.adb b/gcc/ada/gnatls.adb
index ae623897d6c..4a97edde9a5 100644
--- a/gcc/ada/gnatls.adb
+++ b/gcc/ada/gnatls.adb
@@ -1556,7 +1556,7 @@ begin
 
    --  First check for --version or --help
 
-   Check_Version_And_Help ("GNATLS", "1997");
+   Check_Version_And_Help ("GNATLS", "1992");
 
    --  Loop to scan out arguments
 
diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb
index d9973b52a0b..84b7a3b64e0 100644
--- a/gcc/ada/make.adb
+++ b/gcc/ada/make.adb
@@ -5803,7 +5803,7 @@ package body Make is
 
       if Verbose_Mode then
          Write_Eol;
-         Display_Version ("GNATMAKE", "1995");
+         Display_Version ("GNATMAKE", "1992");
       end if;
 
       if Osint.Number_Of_Files = 0 then