From 16c796db5a34caaf4e511c28067247403cd587ad Mon Sep 17 00:00:00 2001 From: Nagaraju Mekala Date: Tue, 11 Feb 2014 01:35:46 +0000 Subject: [PATCH] microblaze.c: Extend mcpu version format 2013-11-26 Nagaraju Mekala * config/microblaze/microblaze.c: Extend mcpu version format From-SVN: r207681 --- gcc/ChangeLog | 4 ++++ gcc/config/microblaze/microblaze.c | 21 ++++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 78e74a723b97..81e9b20ccffe 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2013-11-26 Nagaraju Mekala + + * config/microblaze/microblaze.c: Extend mcpu version format + 2014-02-10 David Holsgrove * 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 c121c2baec32..058ba72d6bdc 100644 --- a/gcc/config/microblaze/microblaze.c +++ b/gcc/config/microblaze/microblaze.c @@ -1609,21 +1609,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')) -- 2.47.2