diff mbox

Don't encode the minor version in the gcj abi version

Message ID 5721C1D4.8080807@ubuntu.com
State New
Headers show

Commit Message

Matthias Klose April 28, 2016, 7:55 a.m. UTC 
Bumping the version from from 6.0.0 to 6.1.0 broke gcj, because the minor 
version is still encoded in the gcj abi, not seen during development of the 6 
series until it was bumped for the final release.

The gcc-5-branch needs a slightly different approach, because we froze the abi 
version only with the 5.3.0 release.


Ok for the 6 branch and the trunk?

Matthias

Comments

Andrew Haley April 28, 2016, 7:56 a.m. UTC | #1 
On 28/04/16 08:55, Matthias Klose wrote:
> Ok for the 6 branch and the trunk?

OK,

Andrew.
Rainer Orth April 28, 2016, 8:39 a.m. UTC | #2 
Matthias Klose <doko@ubuntu.com> writes:

> Bumping the version from from 6.0.0 to 6.1.0 broke gcj, because the minor
> version is still encoded in the gcj abi, not seen during development of the
> 6 series until it was bumped for the final release.

This is PR java/70839.

	Rainer
diff mbox

Patch

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

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

 
--- gcc/java/decl.c
+++ gcc/java/decl.c
@@ -540,9 +540,9 @@ 
   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;