decl.c (parse_version): Don't encode the minor version in the abi version.

2016-04-28  Matthias Klose  <doko@ubuntu.com>

        * decl.c (parse_version): Don't encode the minor version in the abi
        version.

From-SVN: r235546

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 7c20b060cc8058b742f82dc1dbb8bb27737011db..5ed24e42a968e7b276d1d6b39ac4bc7a41b8f2dd 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2016-04-28  Matthias Klose  <doko@ubuntu.com>
+
+       * decl.c (parse_version): Don't encode the minor version in the abi
+       version.
+
 2016-04-18  Michael Matz  <matz@suse.de>
 
        * class.c (add_method_1): Use SET_DECL_ALIGN.

diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index 93304daea0076ffc05a88ace09b03087d8866928..4e50ce98c23f8c43c01b8257e4780926052a5716 100644 (file)
--- a/gcc/java/decl.c
+++ b/gcc/java/decl.c
@@ -540,9 +540,9 @@ parse_version (void)
   else /* C++ ABI */
     {
       /* Implicit in this computation is the idea that we won't break the
-        old-style binary ABI in a sub-minor release (e.g., from 4.0.0 to
-        4.0.1).  */
-      abi_version = 100000 * major + 1000 * minor;
+        old-style binary ABI in a sub-minor release (e.g., from 6.0 to
+        6.1).  */
+      abi_version = 100000 * major;
     }
   if (flag_bootstrap_classes)
     abi_version |= FLAG_BOOTSTRAP_LOADER;