From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 67730 invoked by alias); 28 Apr 2016 07:55:15 -0000 Mailing-List: contact java-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: java-patches-owner@gcc.gnu.org Received: (qmail 67619 invoked by uid 89); 28 Apr 2016 07:55:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.2 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy=Arbeitskopie, arbeitskopie, froze, 5.1 X-Spam-User: qpsmtpd, 2 recipients X-HELO: einhorn.in-berlin.de Received: from einhorn.in-berlin.de (HELO einhorn.in-berlin.de) (192.109.42.8) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Thu, 28 Apr 2016 07:55:04 +0000 X-Envelope-From: doko@ubuntu.com Received: from [192.168.178.29] (ip5f5af410.dynamic.kabel-deutschland.de [95.90.244.16]) (authenticated bits=0) by einhorn.in-berlin.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id u3S7t0Q6010925 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Thu, 28 Apr 2016 09:55:01 +0200 To: GCJ-patches Cc: GCC Patches From: Matthias Klose Subject: [patch] Don't encode the minor version in the gcj abi version Message-ID: <5721C1D4.8080807@ubuntu.com> Date: Thu, 28 Apr 2016 07:55:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------040801070408080207000504" X-IsSubscribed: yes X-SW-Source: 2016-q2/txt/msg00010.txt.bz2 This is a multi-part message in MIME format. --------------040801070408080207000504 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-length: 992 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 --------------040801070408080207000504 Content-Type: text/x-diff; name="gcj-abi-version.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="gcj-abi-version.diff" Content-length: 625 2016-04-28 Matthias Klose * 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; --------------040801070408080207000504--