From: Andreas Schwab <schwab@suse.de>
To: Jakub Jelinek <jakub@redhat.com>
Cc: java-patches@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: Re: [PATCH] Fix linking with -findirect-dispatch
Date: Tue, 16 Apr 2013 16:13:00 -0000 [thread overview]
Message-ID: <mvmtxn6sbc5.fsf@hawking.suse.de> (raw)
In-Reply-To: <20130416102601.GQ12880@tucnak.redhat.com> (Jakub Jelinek's message of "Tue, 16 Apr 2013 12:26:01 +0200")
Jakub Jelinek <jakub@redhat.com> 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)))
--
1.8.2.1
--
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."
next prev parent reply other threads:[~2013-04-16 16:13 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-16 8:36 Andreas Schwab
2013-04-16 8:39 ` Jakub Jelinek
2013-04-16 8:59 ` Bryce McKinlay
2013-04-16 9:13 ` Andreas Schwab
2013-04-16 9:19 ` Jakub Jelinek
2013-04-16 9:37 ` Andreas Schwab
2013-04-16 9:49 ` Jakub Jelinek
2013-04-16 9:55 ` Matthias Klose
2013-04-26 11:22 ` Matthias Klose
2013-04-26 11:50 ` Andrew Haley
2013-04-16 9:57 ` Andreas Schwab
2013-04-16 10:08 ` Jakub Jelinek
2013-04-16 10:11 ` Andreas Schwab
2013-04-16 10:26 ` Jakub Jelinek
2013-04-16 10:31 ` Andreas Schwab
2013-04-16 16:13 ` Andreas Schwab [this message]
2013-04-16 16:19 ` Jakub Jelinek
2013-04-16 17:22 ` Andreas Schwab
2013-06-03 10:56 ` Andreas Schwab
2013-04-16 16:39 ` Bryce McKinlay
2013-04-17 13:17 ` Andreas Schwab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=mvmtxn6sbc5.fsf@hawking.suse.de \
--to=schwab@suse.de \
--cc=gcc-patches@gcc.gnu.org \
--cc=jakub@redhat.com \
--cc=java-patches@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).