From: doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 28 Apr 2016 08:22:10 +0000 (+0000)
Subject: 2016-04-28  Matthias Klose  <doko@ubuntu.com>
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f0307fcb54df45f94a262c3ce5af1cb97b0b4a6d;p=thirdparty%2Fgcc.git

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

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


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@235546 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 7c20b060cc80..5ed24e42a968 100644
--- 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 93304daea007..4e50ce98c23f 100644
--- 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;