gnatvsn.ads (Gnat_Static_Version_String): New constant, used to minimize the differences with ACT tree.

	* gnatvsn.ads (Gnat_Static_Version_String): New constant, used to
	minimize the differences with ACT tree.

	* gnatkr.adb, gnatlink.adb, gnatls.adb, gnatmake.adb,
	gnatprep.adb, gnatpsta.adb, gnatvsn.ads: Take advantage of
	Gnatvsn.Gnat_Static_Version_String to reduce differences between
	ACT and FSF trees.

From-SVN: r72896

8 files changed, 105 insertions, 2 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index b7dccce..35810a6 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,89 @@
+2003-10-24  Arnaud Charlet  <charlet@act-europe.fr>
+
+	* gnatvsn.ads (Gnat_Static_Version_String): New constant, used to
+	minimize the differences with ACT tree.
+
+	* gnatkr.adb, gnatlink.adb, gnatls.adb, gnatmake.adb,
+	gnatprep.adb, gnatpsta.adb, gnatvsn.ads: Take advantage of
+	Gnatvsn.Gnat_Static_Version_String to reduce differences between
+	ACT and FSF trees.
+
+2003-10-24  Pascal Obry  <obry@gnat.com>
+
+	* adadecode.c (ostrcpy): New function.
+	(__gnat_decode): Use ostrcpy of strcpy.
+	(has_prefix): Set first parameter a const.
+	(has_suffix): Set first parameter a const.
+	Update copyright notice. Fix source name in header.
+	Removes a trailing space.
+	PR ada/12014.
+
+2003-10-24  Jose Ruiz  <ruiz@act-europe.fr>
+
+	* exp_disp.adb: 
+	Remove the test against being in No_Run_Time_Mode before generating a
+	call to Register_Tag. It is redundant with the test against the
+	availability of the function Register_Tag.
+
+2003-10-24  Vincent Celier  <celier@gnat.com>
+
+	* g-catiio.adb: (Month_Name): Correct spelling of February
+
+	* make.adb: (Mains): New package
+	(Initialize): Call Mains.Delete
+	(Gnatmake): Check that each main on the command line is a source of a
+	project file and, if there are several mains, each of them is a source
+	of the same project file.
+	(Gnatmake): When a foreign language is specified in attribute Languages,
+	no main is specified on the command line and attribute Mains is not
+	empty, only build the Ada main. If there is no Ada main, just compile
+	the Ada sources and their closure.
+	(Gnatmake): If a main is specified on the command line with directory
+	information, check that the source exists and, if it does, that the path
+	is the actual path of a source of a project.
+
+	* prj-env.adb: 
+	(File_Name_Of_Library_Unit_Body): New Boolean parameter Full_Path. When
+	Full_Path is True, return the full path instead of the simple file name.
+	(Project_Of): New function
+
+	* prj-env.ads: 
+	(File_Name_Of_Library_Unit_Body): New Boolean parameter Full_Path,
+	defaulted to False.
+	(Project_Of): New function
+
+2003-10-24  Arnaud Charlet  <charlet@act-europe.fr>
+
+	* Makefile.generic: 
+	Ensure objects of main project are always checked and rebuilt if needed.
+	Set CC to gcc by default.
+	Prepare new handling of link by creating a global archive (not activated
+	yet).
+
+	* adadecode.h, atree.h, elists.h, nlists.h, raise.h,
+	stringt.h: Update copyright notice. Remove trailing blanks.
+	Fix source name in header.
+
+2003-10-24  Robert Dewar  <dewar@gnat.com>
+
+	* sem_ch12.adb: Minor reformatting
+
+	* sem_ch3.adb: 
+	Minor reformatting (including new function return style throughout)
+
+	* sem_ch3.ads: 
+	Minor reformatting (including new function return style throughout)
+
+2003-10-24  Arnaud Charlet  <charlet@act-europe.fr>
+
+	* adadecode.h, atree.h, elists.h, nlists.h, raise.h,
+	stringt.h: Update copyright notice. Remove trailing blanks.
+	Fix source name in header.
+
+2003-10-24  GNAT Script  <nobody@gnat.com>
+
+	* Make-lang.in: Makefile automatically updated
+
 2003-10-23  Nathanael Nerode  <neroden@gcc.gnu.org>
 
 	* adadecode.h, atree.h, elists.h, namet.h, nlists.h, raise.h,
diff --git a/gcc/ada/gnatkr.adb b/gcc/ada/gnatkr.adb
index 8035e60..6afa288 100644
--- a/gcc/ada/gnatkr.adb
+++ b/gcc/ada/gnatkr.adb
@@ -26,10 +26,13 @@
 
 with Ada.Characters.Handling; use Ada.Characters.Handling;
 with Ada.Command_Line;        use Ada.Command_Line;
+with Gnatvsn;
 with Krunch;
 with System.IO; use System.IO;
 
 procedure Gnatkr is
+   pragma Ident (Gnatvsn.Gnat_Static_Version_String);
+
    Count        : Natural;
    Maxlen       : Integer;
    Exit_Program : exception;
diff --git a/gcc/ada/gnatlink.adb b/gcc/ada/gnatlink.adb
index 1a3407e..123cff5 100644
--- a/gcc/ada/gnatlink.adb
+++ b/gcc/ada/gnatlink.adb
@@ -44,6 +44,7 @@ with GNAT.OS_Lib;          use GNAT.OS_Lib;
 with Interfaces.C_Streams; use Interfaces.C_Streams;
 
 procedure Gnatlink is
+   pragma Ident (Gnatvsn.Gnat_Static_Version_String);
 
    package Gcc_Linker_Options is new Table.Table (
      Table_Component_Type => String_Access,
diff --git a/gcc/ada/gnatls.adb b/gcc/ada/gnatls.adb
index 559f9ac..efa5ed6 100644
--- a/gcc/ada/gnatls.adb
+++ b/gcc/ada/gnatls.adb
@@ -41,6 +41,8 @@ with Targparm;    use Targparm;
 with Types;       use Types;
 
 procedure Gnatls is
+   pragma Ident (Gnat_Static_Version_String);
+
    Max_Column : constant := 80;
 
    type File_Status is (
diff --git a/gcc/ada/gnatmake.adb b/gcc/ada/gnatmake.adb
index 2f8adc1..f983516 100644
--- a/gcc/ada/gnatmake.adb
+++ b/gcc/ada/gnatmake.adb
@@ -26,9 +26,11 @@
 
 --  Gnatmake usage: please consult the gnat documentation
 
+with Gnatvsn;
 with Make;
 
 procedure Gnatmake is
+   pragma Ident (Gnatvsn.Gnat_Static_Version_String);
 begin
    --  The real work is done in Package Make. Gnatmake used to be a standalone
    --  routine. Now Gnatmake's facilities have been placed in a package
diff --git a/gcc/ada/gnatprep.adb b/gcc/ada/gnatprep.adb
index 08c15ae..1151158 100644
--- a/gcc/ada/gnatprep.adb
+++ b/gcc/ada/gnatprep.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1996-2002, Free Software Foundation, Inc.         --
+--          Copyright (C) 1996-2003, 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- --
@@ -24,9 +24,11 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
+with Gnatvsn;
 with GPrep;
 
 procedure GNATprep is
+   pragma Ident (Gnatvsn.Gnat_Static_Version_String);
 begin
    --  Everything is done in GPrep
 
diff --git a/gcc/ada/gnatpsta.adb b/gcc/ada/gnatpsta.adb
index 3683367..502445d 100644
--- a/gcc/ada/gnatpsta.adb
+++ b/gcc/ada/gnatpsta.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1997-2001 Free Software Foundation, Inc.          --
+--          Copyright (C) 1997-2003 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- --
@@ -33,11 +33,14 @@
 --  integer and floating point sizes.
 
 with Ada.Text_IO; use Ada.Text_IO;
+with Gnatvsn;
 with Ttypef;      use Ttypef;
 with Ttypes;      use Ttypes;
 with Types;       use Types;
 
 procedure GnatPsta is
+   pragma Ident (Gnatvsn.Gnat_Static_Version_String);
+
    procedure P (Item : String) renames Ada.Text_IO.Put_Line;
 
    procedure P_Int_Range   (Size : Pos; Put_First : Boolean := True);
diff --git a/gcc/ada/gnatvsn.ads b/gcc/ada/gnatvsn.ads
index 82996cf..f665e53 100644
--- a/gcc/ada/gnatvsn.ads
+++ b/gcc/ada/gnatvsn.ads
@@ -41,6 +41,10 @@ package Gnatvsn is
    --  GNATBIND, GNATCHOP, GNATFIND, GNATLINK, GNATMAKE, GNATXREF, are run
    --  (with appropriate verbose option switch set).
 
+   Gnat_Static_Version_String : constant String := "GNU Ada";
+   --  Static string identifying this version, that can be used as an argument
+   --  to e.g. pragma Ident.
+
    Gnat_Version_Type : constant String := "FSF    ";
    --  GNAT FSF version. This version of GNAT is part of a Free Software
    --  Foundation release of the GNU Compiler Collection (GCC). The binder