From patchwork Sun Jan 3 11:38:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Klose X-Patchwork-Id: 562163 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 58DAC14031D for ; Sun, 3 Jan 2016 22:38:41 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=wDiuoxa5; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :subject:to:references:cc:from:message-id:date:mime-version :in-reply-to:content-type; q=dns; s=default; b=U+0Updar9TMVuLOmI h8/LgyVfgGd/T1H0NYG3QroRRq9BJN5Z9PzKFneOlV6DLZaOvaNn3PpWlM4ZAHR2 76ELnSLCYiAf7QZ+jiuvIfsz2LueJhBasR66FWm8uyqirGlwU/SEGhGFJx79l0NA f7E19qgOaCCKVx3WOJzUZiDBCQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :subject:to:references:cc:from:message-id:date:mime-version :in-reply-to:content-type; s=default; bh=u1MvfRRZSEYcy57LFEXppOy A4CE=; b=wDiuoxa5g4ohadhvgqw36vnQEtoTevFcx3rclw0aqZlYMBxJ+Wv3lhF 6ZO1KOqALEtfxdqLY8JImdff6uxBz4RP8TV4oW25eqFLOkLU6eQ93H/nZ1qvrOOX 0g2EUXgNIEYWriLjPb/sbU9ZAvp8kJYCK1K41MZgbU5FN/OUnizM= Received: (qmail 116848 invoked by alias); 3 Jan 2016 11:38:33 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 116838 invoked by uid 89); 3 Jan 2016 11:38:32 -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_ASCII_DIVIDERS autolearn=no version=3.3.2 spammy=AGE, 4.0.0, 6867, CURRENT X-HELO: fencepost.gnu.org Received: from fencepost.gnu.org (HELO fencepost.gnu.org) (208.118.235.10) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Sun, 03 Jan 2016 11:38:32 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55952) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1aFgzV-00065A-RJ for gcc-patches@gnu.org; Sun, 03 Jan 2016 06:38:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aFgzS-0007H0-BM for gcc-patches@gnu.org; Sun, 03 Jan 2016 06:38:29 -0500 Received: from einhorn.in-berlin.de ([2001:bf0:c000::1:8]:59290) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aFgzS-0007Gr-1J for gcc-patches@gnu.org; Sun, 03 Jan 2016 06:38:26 -0500 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 u03BcInJ028691 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sun, 3 Jan 2016 12:38:18 +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> Cc: GCJ-patches , "gcc-patches@gnu.org" From: Matthias Klose Message-ID: <56890829.4020601@ubuntu.com> Date: Sun, 3 Jan 2016 12:38:17 +0100 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: <5687F698.20106@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 2001:bf0:c000::1:8 On 02.01.2016 17:11, Andrew Haley wrote: > On 02/01/16 15:53, Matthias Klose wrote: >>>> In any case, GCJ_CXX_ABI_VERSION should be changed to not include __GNUC_MINOR__ >>>>>> anymore. Maybe for the gcc-5-branch, set it unconditionally to 3 so that it >>>>>> won't change anymore with future releases from the gcc-5 branch? >>>> >>>> That's safe only if Classpath and libgcj are not changed at all. >> why? > > Because of the way that gcj's linkage works. If you change any of the > vtable/itable indexes your program will crash. Right, but this no change compared to the 4.x.y releases. This is what I committed to the trunk. So what to do with the gcc-5 branch? Apply the same patch to jvm.h, or fix the minor version to 3? The latter would be compatible at least with the 5.3 release. Matthias 2016-01-03 Matthias Klose * libtool-version: Bump soversion. * include/jvm.h (GCJ_CXX_ABI_VERSION): Don't encode __GNUC_MINOR__. Index: libjava/include/jvm.h =================================================================== --- libjava/include/jvm.h (revision 232039) +++ libjava/include/jvm.h (working copy) @@ -686,7 +686,7 @@ loader. */ // These are used to find ABI versions we recognize. -#define GCJ_CXX_ABI_VERSION (__GNUC__ * 100000 + __GNUC_MINOR__ * 1000) +#define GCJ_CXX_ABI_VERSION (__GNUC__ * 100000) // 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) Index: libjava/libtool-version =================================================================== --- libjava/libtool-version (revision 232039) +++ libjava/libtool-version (working copy) @@ -5,4 +5,4 @@ # Note: When changing the version here, please do also update LIBGCJ_SONAME # in gcc/config/i386/cygwin.h and gcc/config/i386/mingw32.h. # CURRENT:REVISION:AGE -16:0:0 +17:0:0