From patchwork Tue Apr 16 16:13:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 237031 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 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id DFE112C012C for ; Wed, 17 Apr 2013 02:13:33 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:references:date:in-reply-to:message-id :mime-version:content-type; q=dns; s=default; b=dbBzrFtJEEtDpJB2 7PwmOXW56IAqiyb469lCNMsnwpoA/Q2KzDl54GUVKQcGHBJfj+RhRJ9Gv1pwLhYo JnoKmY9V+KhguQFkrcZayRRgv3SY6V58/8+1Po8E3Pzn4ko6t0mz1uo1W+J7YzD5 cCLZCXDHNjT0xn5JfmfWOh0KBxE= 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:from :to:cc:subject:references:date:in-reply-to:message-id :mime-version:content-type; s=default; bh=t4lmqOBtXtY2CLG/glu1xN mX6jY=; b=FQhfYhQDlwXXzQumWManmaYVMNm1I3Ow7sSW386qHF6IYOhioZH/ga bq65jF+B1NlOF/fOVytU83umjvcSnR9sGcHzXMSQuIoMNBgLpj3uyrnxAKTeIYXd kmSgzS9edQGsUjBbhMLoI+ePNNL4nrMlXRAYS6h/aleIrBmFjmhOs= Received: (qmail 7474 invoked by alias); 16 Apr 2013 16:13:22 -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 7455 invoked by uid 89); 16 Apr 2013 16:13:22 -0000 X-Spam-SWARE-Status: No, score=-5.3 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, TW_GC autolearn=ham version=3.3.1 X-Spam-User: qpsmtpd, 2 recipients Received: from cantor2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Tue, 16 Apr 2013 16:13:18 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 05989A5443; Tue, 16 Apr 2013 18:13:15 +0200 (CEST) From: Andreas Schwab To: Jakub Jelinek Cc: java-patches@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: Re: [PATCH] Fix linking with -findirect-dispatch References: <20130416083855.GM12880@tucnak.redhat.com> <20130416091929.GN12880@tucnak.redhat.com> <20130416094852.GO12880@tucnak.redhat.com> <20130416100851.GP12880@tucnak.redhat.com> <20130416102601.GQ12880@tucnak.redhat.com> X-Yow: Well, O.K. I'll compromise with my principles because of EXISTENTIAL DESPAIR! Date: Tue, 16 Apr 2013 18:13:14 +0200 In-Reply-To: <20130416102601.GQ12880@tucnak.redhat.com> (Jakub Jelinek's message of "Tue, 16 Apr 2013 12:26:01 +0200") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 Jakub Jelinek writes: > I'm pretty sure when the changes were added for gcc 4.2 it worked just fine, I'm pretty sure it never worked as intented. Andreas. * Makefile.am (toolexeclib_LTLIBRARIES) [USE_LIBGCJ_BC]: Use install/libgcj_bc.la instead of libgcj_bc.la. (noinst_LTLIBRARIES) [USE_LIBGCJ_BC]: Define. (install_libgcj_bc_la_SOURCES): Define. (install/libgcj_bc.la): New rule. * Makefile.in: Rebuild. --- libjava/Makefile.am | 9 +++++- libjava/Makefile.in | 92 +++++++++++++++++++++++++++++++++++------------------ 2 files changed, 69 insertions(+), 32 deletions(-) diff --git a/libjava/Makefile.am b/libjava/Makefile.am index a4941a9..208e632 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -212,7 +212,8 @@ LIBJAVA_CORE_EXTRA = endif if USE_LIBGCJ_BC -toolexeclib_LTLIBRARIES += libgcj_bc.la +toolexeclib_LTLIBRARIES += install/libgcj_bc.la +noinst_LTLIBRARIES = libgcj_bc.la endif if XLIB_AWT @@ -606,6 +607,7 @@ lib_gnu_awt_xlib_la_LINK = $(LIBLINK) $(lib_gnu_awt_xlib_la_LDFLAGS) \ ## This lets us have one soname in BC objects and another in C++ ABI objects. ## This library is not linked against libgcj. libgcj_bc_la_SOURCES = libgcj_bc.c +install_libgcj_bc_la_SOURCES = $(libgcj_bc_la_SOURCES) libgcj_bc_la_LDFLAGS = -rpath $(toolexeclibdir) -no-static -version-info 1:0:0 \ $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBJAVA_LDFLAGS_NOUNDEF) libgcj_bc_la_DEPENDENCIES = libgcj.la $(libgcj_bc_la_version_dep) @@ -628,6 +630,11 @@ libgcj_bc.la: $(libgcj_bc_la_OBJECTS) $(libgcj_bc_la_DEPENDENCIES) rm .libs/libgcj_bc.so.1; \ $(LN_S) libgcj_bc.so.1.0.0 .libs/libgcj_bc.so.1 +## This rule creates the libgcj_bc library that is actually installed. +install/libgcj_bc.la: $(libgcj_bc_la_OBJECTS) $(libgcj_bc_la_DEPENDENCIES) install/$(am__dirstamp) + $(libgcj_bc_la_LINK) $(am_libgcj_bc_la_rpath) $(libgcj_bc_la_LDFLAGS) \ + $(libgcj_bc_la_OBJECTS) $(libgcj_bc_la_LIBADD) $(LIBS) + ## Note that property_files is defined in sources.am. propertyo_files = $(patsubst classpath/resource/%,%,$(addsuffix .lo,$(property_files)))