gnatvsn.ads: Minor code reorg to remember more easily to update variables.

	* gnatvsn.ads: Minor code reorg to remember more easily to update
	variables.

From-SVN: r223566

gcc/ada/ChangeLog

+2015-05-22  Arnaud Charlet  <charlet@adacore.com>
+
+	* gnatvsn.ads: Minor code reorg to remember more easily to update
+	variables.
+
 2015-05-22  Ed Schonberg  <schonberg@adacore.com>
 
 	* sem_ch10.adb (Analyze_With_Clause): In ASIS_Mode, a

gcc/ada/gnatvsn.ads

@@ -38,6 +38,19 @@ package Gnatvsn is
    --  Static string identifying this version, that can be used as an argument
    --  to e.g. pragma Ident.
 
+   Library_Version : constant String := "6";
+   --  Library version. It needs to be updated whenever the major or
+   --  minor version number is changed.
+   --
+   --  Note: Makefile.in uses the library version string to construct the
+   --  soname value.
+
+   Current_Year : constant String := "2015";
+   --  Used in printing copyright messages
+
+   Verbose_Library_Version : constant String := "GNAT Lib v" & Library_Version;
+   --  Version string stored in e.g. ALI files
+
    function Gnat_Version_String return String;
    --  Version output when GNAT (compiler), or its related tools, including
    --  GNATBIND, GNATCHOP, GNATFIND, GNATLINK, GNATMAKE, GNATXREF, are run
@@ -82,17 +95,4 @@ package Gnatvsn is
    --  Prefix generated by binder. If it is changed, be sure to change
    --  GNAT.Compiler_Version.Ver_Prefix as well.
 
-   Library_Version : constant String := "6";
-   --  Library version. This value must be updated when the compiler
-   --  version number Gnat_Static_Version_String is updated.
-   --
-   --  Note: Makefile.in uses the library version string to construct the
-   --  soname value.
-
-   Verbose_Library_Version : constant String := "GNAT Lib v" & Library_Version;
-   --  Version string stored in e.g. ALI files
-
-   Current_Year : constant String := "2015";
-   --  Used in printing copyright messages
-
 end Gnatvsn;