From: Matthias Klose <doko@ubuntu.com>
To: GCJ-patches <java-patches@gcc.gnu.org>
Cc: GCC Patches <gcc-patches@gcc.gnu.org>
Subject: [patch] Don't encode the minor version in the gcj abi version
Date: Thu, 28 Apr 2016 07:55:00 -0000 [thread overview]
Message-ID: <5721C1D4.8080807@ubuntu.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 992 bytes --]
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.
--- gcc/java/decl.c (Revision 235458)
+++ gcc/java/decl.c (Arbeitskopie)
@@ -561,9 +561,10 @@
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 5.0 to
+ 5.1). Freeze the ABI on the gcc-5-branch with the value of the
+ GCC 5.3 release.*/
+ abi_version = 100000 * major + 1000 * 3;
}
if (flag_bootstrap_classes)
abi_version |= FLAG_BOOTSTRAP_LOADER;
Ok for the 6 branch and the trunk?
Matthias
[-- Attachment #2: gcj-abi-version.diff --]
[-- Type: text/x-diff, Size: 625 bytes --]
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;
next reply other threads:[~2016-04-28 7:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-28 7:55 Matthias Klose [this message]
2016-04-28 7:56 ` Andrew Haley
2016-04-28 8:39 ` Rainer Orth
2016-04-28 10:52 ` Rainer Orth
2016-04-28 11:45 ` Matthias Klose
2016-04-28 11:47 ` Andrew Haley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5721C1D4.8080807@ubuntu.com \
--to=doko@ubuntu.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=java-patches@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).