From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 120416 invoked by alias); 28 Apr 2016 10:52:19 -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 120358 invoked by uid 89); 28 Apr 2016 10:52:18 -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,KAM_LAZY_DOMAIN_SECURITY,RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy= X-Spam-User: qpsmtpd, 2 recipients X-HELO: smtp.CeBiTec.Uni-Bielefeld.DE Received: from smtp.CeBiTec.Uni-Bielefeld.DE (HELO smtp.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 28 Apr 2016 10:52:08 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 4F724A56; Thu, 28 Apr 2016 12:52:05 +0200 (CEST) Received: from smtp.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (malfoy.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) (amavisd-new, port 10024) with LMTP id byxst8aTW5xT; Thu, 28 Apr 2016 12:52:03 +0200 (CEST) Received: from lokon.CeBiTec.Uni-Bielefeld.DE (lokon.CeBiTec.Uni-Bielefeld.DE [129.70.161.110]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPS id 9D259A55; Thu, 28 Apr 2016 12:52:01 +0200 (CEST) Received: (from ro@localhost) by lokon.CeBiTec.Uni-Bielefeld.DE (8.15.2+Sun/8.15.2/Submit) id u3SAq1JN003685; Thu, 28 Apr 2016 12:52:01 +0200 (CEST) From: Rainer Orth To: Matthias Klose Cc: GCJ-patches , GCC Patches Subject: Re: [patch] Don't encode the minor version in the gcj abi version References: <5721C1D4.8080807@ubuntu.com> Date: Thu, 28 Apr 2016 10:52:00 -0000 In-Reply-To: (Rainer Orth's message of "Thu, 28 Apr 2016 10:39:24 +0200") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (usg-unix-v) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-SW-Source: 2016-q2/txt/msg00013.txt.bz2 --=-=-= Content-Type: text/plain Content-length: 630 Rainer Orth writes: > Matthias Klose 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. I just noticed that your patch is incomplete: it leaves the now unused minor around and incorrectly talks about sub-minor versions... Here's what I had in the PR instead: 2016-04-28 Rainer Orth PR java/70839 * decl.c (parse_version): Remove minor handling. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=java-abi-minor-version.patch Content-length: 1212 # HG changeset patch # Parent acf979f160547bd8b9b207525f97c29f6c9a9a6e Don't include minor version in GCJ ABI version diff --git a/gcc/java/decl.c b/gcc/java/decl.c --- a/gcc/java/decl.c +++ b/gcc/java/decl.c @@ -507,7 +507,7 @@ static void parse_version (void) { const char *p = version_string; - unsigned int major = 0, minor = 0; + unsigned int major = 0; unsigned int abi_version; /* Skip leading junk. */ @@ -525,13 +525,6 @@ parse_version (void) gcc_assert (*p == '.' && ISDIGIT (p[1])); ++p; - /* Extract minor version. */ - while (ISDIGIT (*p)) - { - minor = minor * 10 + *p - '0'; - ++p; - } - if (flag_indirect_dispatch) { abi_version = GCJ_CURRENT_BC_ABI_VERSION; @@ -540,9 +533,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 minor release (e.g., from 6.1.0 to + 6.2.0). */ + abi_version = 100000 * major; } if (flag_bootstrap_classes) abi_version |= FLAG_BOOTSTRAP_LOADER; --=-=-= Content-Type: text/plain Content-length: 152 Rainer -- ----------------------------------------------------------------------------- Rainer Orth, Center for Biotechnology, Bielefeld University --=-=-=--