re PR ada/30827 (GNAT.compiler_version problem for official releases)

	PR ada/30827
	* g-comver.adb (Ver_Len_Max): Fix inconsistency.

From-SVN: r142274

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index b212a11..634b140 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-29  Eric Botcazou  <ebotcazou@adacore.com>
+
+       PR ada/30827
+       * g-comver.adb (Ver_Len_Max): Fix inconsistency.
+
 2008-11-27  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gcc-interface/decl.c: Fix various nits.

diff --git a/gcc/ada/g-comver.adb b/gcc/ada/g-comver.adb
index ae3bf3b..e3191b5 100644 (file)
--- a/gcc/ada/g-comver.adb
+++ b/gcc/ada/g-comver.adb
@@ -37,7 +37,7 @@
 
 package body GNAT.Compiler_Version is
 
-   Ver_Len_Max : constant := 32;
+   Ver_Len_Max : constant := 64;
    --  This is logically a reference to Gnatvsn.Ver_Len_Max but we cannot
    --  import this directly since run-time units cannot WITH compiler units.
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e369022..707a959 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-29  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * gnat.dg/test_version.adb: Adjust to new string length.
+
 2008-11-28  Andrew Pinski  <andrew_pinski@playstation.sony.com>
 
        PR testsuite/38311

diff --git a/gcc/testsuite/gnat.dg/test_version.adb b/gcc/testsuite/gnat.dg/test_version.adb
index d7fa297..2b88a14 100644 (file)
--- a/gcc/testsuite/gnat.dg/test_version.adb
+++ b/gcc/testsuite/gnat.dg/test_version.adb
@@ -5,8 +5,8 @@ procedure Test_Version is
    use Vsn;
    X : constant String := Version;
 begin
-   if X'Length = 46 then
-      -- 46 = Ver_Len_Max + Ver_Prefix
+   if X'Length = 78 then
+      -- 78 = Ver_Len_Max + Ver_Prefix'Length
       -- actual version should be shorter than this
       raise Program_Error;
    end if;