Resync.

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

1 files changed, 13 insertions, 16 deletions

diff --git a/gcc/ada/gnatvsn.ads b/gcc/ada/gnatvsn.ads
index f17343e0686..009dbee1052 100644
--- a/gcc/ada/gnatvsn.ads
+++ b/gcc/ada/gnatvsn.ads
@@ -45,7 +45,7 @@ package Gnatvsn is
    --  Static string identifying this version, that can be used as an argument
    --  to e.g. pragma Ident.
 
-   type Gnat_Build_Type is (FSF, Public, GAP);
+   type Gnat_Build_Type is (FSF, GPL);
    --  See Get_Gnat_Build_Type below for the meaning of these values.
 
    function Get_Gnat_Build_Type return Gnat_Build_Type;
@@ -53,28 +53,25 @@ package Gnatvsn is
    --
    --    FSF
    --       GNAT FSF version. This version of GNAT is part of a Free Software
-   --       Foundation release of the GNU Compiler Collection (GCC). The binder
-   --       will not output informational messages regarding intended use,
-   --       and the bug box generated by Comperr will give information on
-   --       how to report bugs and list the "no warranty" information.
+   --       Foundation release of the GNU Compiler Collection (GCC). The bug
+   --       box generated by Comperr gives information on how to report bugs
+   --       and list the "no warranty" information.
    --
-   --    Public
-   --       GNAT Public version.
-   --       The binder will output informational messages, and the bug box
-   --       generated by the package Comperr will give appropriate bug
-   --       submission instructions.
-   --
-   --    GAP
-   --       GNAT Academic Program, similar to Public.
+   --    GPL
+   --       GNAT GPL Edition. This is a special version of GNAT, released by
+   --       Ada Core Technologies and intended for academic users, and free
+   --       software developers. The bug box generated by the package Comperr
+   --       gives appropriate bug submission instructions that do not reference
+   --       customer number etc.
 
-   Ver_Len_Max : constant := 32;
+   Ver_Len_Max : constant := 64;
    --  Longest possible length for Gnat_Version_String in this or any
    --  other version of GNAT. This is used by the binder to establish
    --  space to store any possible version string value for checks. This
    --  value should never be decreased in the future, but it would be
    --  OK to increase it if absolutely necessary.
 
-   Library_Version : constant String := "4.2";
+   Library_Version : constant String := "4.3";
    --  Library version. This value must be updated whenever any change to the
    --  compiler affects the library formats in such a way as to obsolete
    --  previously compiled library modules.
@@ -85,7 +82,7 @@ package Gnatvsn is
    Verbose_Library_Version : constant String := "GNAT Lib v" & Library_Version;
    --  Version string stored in e.g. ALI files.
 
-   ASIS_Version_Number : constant := 5;
+   ASIS_Version_Number : constant := 6;
    --  ASIS Version. This is used to check for consistency between the compiler
    --  used to generate trees, and an ASIS application that is reading the
    --  trees. It must be updated (incremented) whenever a change is made to