From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20173 invoked by alias); 3 Jan 2016 17:34:56 -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 20162 invoked by uid 89); 3 Jan 2016 17:34:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy=4.0.0, 6867, loader, dokoubuntucom 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; Sun, 03 Jan 2016 17:34:54 +0000 X-Envelope-From: doko@ubuntu.com Received: from [192.168.178.29] (ip5f5bf74d.dynamic.kabel-deutschland.de [95.91.247.77] (may be forged)) (authenticated bits=0) by einhorn.in-berlin.de (8.14.4/8.14.4/Debian-4) with ESMTP id u03HY1tQ029860 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sun, 3 Jan 2016 18:34:06 +0100 Subject: Re: [patch] [java] bump libgcj soname To: Andrew Haley , Jakub Jelinek References: <55365991.4030806@ubuntu.com> <20150421141125.GW1725@tucnak.redhat.com> <55365BB2.4080603@ubuntu.com> <20150421141924.GX1725@tucnak.redhat.com> <55365EE0.8070202@ubuntu.com> <20150421143747.GY1725@tucnak.redhat.com> <5687E158.7000401@ubuntu.com> <5687EF4D.5030304@redhat.com> <5687F269.7030109@ubuntu.com> <5687F698.20106@redhat.com> <56890829.4020601@ubuntu.com> <56892D5F.1050301@redhat.com> <568943AC.20108@ubuntu.com> <56894AFC.5040608@redhat.com> Cc: GCJ-patches , "gcc-patches@gnu.org" From: Matthias Klose Message-ID: <56895B88.60504@ubuntu.com> Date: Sun, 03 Jan 2016 17:34:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <56894AFC.5040608@redhat.com> Content-Type: multipart/mixed; boundary="------------070406030805030006000200" X-IsSubscribed: yes X-SW-Source: 2016-q1/txt/msg00008.txt.bz2 This is a multi-part message in MIME format. --------------070406030805030006000200 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Content-length: 876 On 03.01.2016 17:23, Andrew Haley wrote: > On 03/01/16 15:52, Matthias Klose wrote: >> No, libgcj versions up to 4.9.3 didn't change the value for releases taken from >> the same branch. All of 4.9.0, 4.9.1, 4.9.2, 4.9.3 have the same >> GCJ_CXX_ABI_VERSION. But 5.1, 5.2 and 5.3 have *different* GCJ_CXX_ABI_VERSIONs. >> >>>> Why change this rule now, at this stage of GCJ's life? >> This was changed by the change of the version schema, an unintential change for >> GCJ_CXX_ABI_VERSION. I want to keep it that way, not change it with every >> release from the gcc-5 branch. > > Because effectively we've done an arithmetic shift left on the GCC version > numbering, I guess? So where we would have had 5.1.1, 5.1.2, 5.1.3, we now > have 5.1, 5.2, 5.3? yes, exactly. > If that's the idea, your patch is OK. committed the attached patch to the gcc-5-branch. Matthias --------------070406030805030006000200 Content-Type: text/x-diff; name="version.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="version.diff" Content-length: 846 2016-01-03 Matthias Klose * include/jvm.h (GCJ_CXX_ABI_VERSION): Freeze the ABI for releases made from the gcc-5-branch. Index: include/jvm.h =================================================================== --- include/jvm.h (revision 232040) +++ include/jvm.h (working copy) @@ -686,7 +686,10 @@ loader. */ // These are used to find ABI versions we recognize. -#define GCJ_CXX_ABI_VERSION (__GNUC__ * 100000 + __GNUC_MINOR__ * 1000) +// GCC 5 changed the versioning schema; the __GNUC_MINOR__ is not anymore +// a part of a GCC release series. Freeze the ABI on the gcc-5-branch with +// the value of the GCC 5.3 release. +#define GCJ_CXX_ABI_VERSION (__GNUC__ * 100000 + 3 * 1000) // This is the old-style BC version ID used by GCJ 4.0.0. #define OLD_GCJ_40_BC_ABI_VERSION (4 * 10000 + 0 * 10 + 5) --------------070406030805030006000200--