aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNagaraju Mekala <nagaraju.mekala@xilinx.com>2014-02-11 01:34:03 +0000
committerMichael Eager <eager@gcc.gnu.org>2014-02-11 01:34:03 +0000
commited8b71cc56709133186faad24a65c4926de73bcc (patch)
treeaeb500b8820a18b5c5b443e3bcfbeea0c4876eb8
parent9b5414c6e4306c998662b5a5813ae3bcc3d18bd7 (diff)
downloadgcc-ed8b71cc56709133186faad24a65c4926de73bcc.zip
gcc-ed8b71cc56709133186faad24a65c4926de73bcc.tar.gz
gcc-ed8b71cc56709133186faad24a65c4926de73bcc.tar.bz2
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
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/config/microblaze/microblaze.c21
2 files changed, 18 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 08ef8dd..8198a5f 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 45da3c8..cd2a788 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'))