From: Jack Howarth <howarth@bromo.med.uc.edu>
To: gcc-patches@gcc.gnu.org
Cc: tromey@gcc.gnu.org, ro@gcc.gnu.org, java-patches@gcc.gnu.org
Subject: [PATCH] move libiconv linkage from libgcj.spec.in to libgcj_la_LDFLAGS
Date: Sat, 18 Jun 2011 07:51:00 -0000 [thread overview]
Message-ID: <20110618055143.GA30332@bromo.med.uc.edu> (raw)
The attached patch moves the linkage on $(LDLIBICONV) from libgcj.spec.in to a more correct
direct linkage on libgcj which contains the unresolved symbols. This change also solves problems
when a multilib only has libiconv for one of the two architectures (ie building gcc trunk on
x86_64 fink which lacks a i386 libiconv). Bootstrap and libjava regression tested on x86_64 darwin11.
Okay for gcc trunk?
Jack
2011-06-18 Jack Howarth <howarth@bromo.med.uc.edu>
* libjava/libgcj.spec.in: Don't pass @LDLIBICONV@.
* libjava/Makefile.am (libgcj_la_LDFLAGS): Pass @LDLIBICONV@.
* libjava/Makefile.in: Regenerate.
Index: libjava/libgcj.spec.in
===================================================================
--- libjava/libgcj.spec.in (revision 175163)
+++ libjava/libgcj.spec.in (working copy)
@@ -7,6 +7,6 @@
*startfile: @THREADSTARTFILESPEC@ %(startfileorig)
%rename lib liborig
-*lib: @LD_START_STATIC_SPEC@ @LIBGCJ_SPEC@ @LD_FINISH_STATIC_SPEC@ @LIBMATHSPEC@ @LDLIBICONV@ @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@ %(libgcc) @LIBSTDCXXSPEC@ %(liborig)
+*lib: @LD_START_STATIC_SPEC@ @LIBGCJ_SPEC@ @LD_FINISH_STATIC_SPEC@ @LIBMATHSPEC@ @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@ %(libgcc) @LIBSTDCXXSPEC@ %(liborig)
*jc1: @HASH_SYNC_SPEC@ @DIVIDESPEC@ @CHECKREFSPEC@ @JC1GCSPEC@ @EXCEPTIONSPEC@ @BACKTRACESPEC@ @IEEESPEC@ @ATOMICSPEC@ @LIBGCJ_BC_SPEC@ -fkeep-inline-functions
Index: libjava/Makefile.am
===================================================================
--- libjava/Makefile.am (revision 175163)
+++ libjava/Makefile.am (working copy)
@@ -492,7 +492,7 @@ xlib_nat_files = $(xlib_nat_source_files
libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(extra_ldflags) $(THREADLIBS) \
$(LIBLTDL) $(SYS_ZLIBS) $(LIBJAVA_LDFLAGS_NOUNDEF) \
-version-info `grep -v '^\#' $(srcdir)/libtool-version` \
- $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBGCJ_LD_EXPORT_ALL)
+ $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBGCJ_LD_EXPORT_ALL) $(LDLIBICONV)
libgcj_la_LIBADD = \
classpath/native/fdlibm/libfdlibm.la \
java/lang/Object.lo \
reply other threads:[~2011-06-18 5:52 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20110618055143.GA30332@bromo.med.uc.edu \
--to=howarth@bromo.med.uc.edu \
--cc=gcc-patches@gcc.gnu.org \
--cc=java-patches@gcc.gnu.org \
--cc=ro@gcc.gnu.org \
--cc=tromey@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).