From: Nagaraju Mekala <nagaraju.mekala@xilinx.com>
Date: Tue, 11 Feb 2014 01:34:03 +0000 (+0000)
Subject: microblaze.c: Extend mcpu version format
X-Git-Tag: releases/gcc-4.9.0~970
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed8b71cc56709133186faad24a65c4926de73bcc;p=thirdparty%2Fgcc.git

microblaze.c: Extend mcpu version format

2013-11-26  Nagaraju Mekala <nagaraju.mekala@xilinx.com>

 * gcc/config/microblaze/microblaze.c: Extend mcpu version format

From-SVN: r207680
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 08ef8ddc2ade..8198a5f3b515 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-26  Nagaraju Mekala <nagaraju.mekala@xilinx.com>
+
+	* config/microblaze/microblaze.c: Extend mcpu version format
+
 2014-02-10  David Holsgrove <david.holsgrove@xilinx.com>
 
 	* config/microblaze/microblaze.h: Define SIZE_TYPE and PTRDIFF_TYPE.
diff --git a/gcc/config/microblaze/microblaze.c b/gcc/config/microblaze/microblaze.c
index 45da3c87ee4c..cd2a788caaea 100644
--- a/gcc/config/microblaze/microblaze.c
+++ b/gcc/config/microblaze/microblaze.c
@@ -1612,21 +1612,28 @@ static int
 microblaze_version_to_int (const char *version)
 {
   const char *p, *v;
-  const char *tmpl = "vX.YY.Z";
+  const char *tmpl = "vXX.YY.Z";
   int iver = 0;
 
   p = version;
   v = tmpl;
 
-  while (*v)
+  while (*p)
     {
       if (*v == 'X')
 	{			/* Looking for major  */
-	  if (!(*p >= '0' && *p <= '9'))
-	    return -1;
-	  iver += (int) (*p - '0');
-	  iver *= 10;
-	}
+          if (*p == '.')
+            {
+              *v++;
+            }
+          else
+            {
+	      if (!(*p >= '0' && *p <= '9'))
+	        return -1;
+	      iver += (int) (*p - '0');
+              iver *= 10;
+	     }
+        }
       else if (*v == 'Y')
 	{			/* Looking for minor  */
 	  if (!(*p >= '0' && *p <= '9'))