This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Fix PR java/21206: Unrecognized option '-Wl,-rpath' for jv-convert
- From: Ralf Wildenhues <Ralf dot Wildenhues at gmx dot de>
- To: gcc-patches at gcc dot gnu dot org, java-patches at gcc dot gnu dot org
- Cc: Gerald Pfeifer <gerald at pfeifer dot com>
- Date: Sat, 29 Jan 2011 11:14:08 +0100
- Subject: Fix PR java/21206: Unrecognized option '-Wl,-rpath' for jv-convert
Proposed patch for trunk below. Gerald, can you (or somebody else who
experiences the problem) please confirm that it fixes things for you
(after rerunning autoconf-2.64 in libjava/)?
Otherwise, bootreg on i686-pc-linux-gnu is running. OK for trunk
if it passes and given positive feedback? What about backporting
after a few weeks? The issue has been present since at least 4.0,
so it is not a recent regression.
Thanks,
Ralf
Fix PR java/21206: Unrecognized option '-Wl,-rpath' for jv-convert
libjava/:
PR java/21206
* configure.ac (LDLIBICONV): New substituted variable, with
instances of '-Wl,' removed from LIBICONV.
* configure: Regenerate.
* libgcj.spec.in: Use @LDLIBICONV@ not @LIBICONV@.
* Makefile.in: Regenerate.
* gcj/Makefile.in: Likewise.
* include/Makefile.in: Likewise.
* testsuite/Makefile.in: Likewise.
diff --git a/libjava/configure.ac b/libjava/configure.ac
index 52e5d78..284a013 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -1240,6 +1240,8 @@ else
AM_ICONV
AM_LC_MESSAGES
AC_STRUCT_TIMEZONE
+ LDLIBICONV=`echo " $LIBICONV " | sed "s/${acl_cv_wl--Wl,}/ /g; s/,/ /g"`
+ AC_SUBST([LDLIBICONV])
AC_CHECK_FUNCS(gethostbyname_r, [
AC_DEFINE(HAVE_GETHOSTBYNAME_R, 1,
diff --git a/libjava/libgcj.spec.in b/libjava/libgcj.spec.in
index 8d39532..22eec3d 100644
--- a/libjava/libgcj.spec.in
+++ b/libjava/libgcj.spec.in
@@ -7,6 +7,6 @@
*startfile: @THREADSTARTFILESPEC@ %(startfileorig)
%rename lib liborig
-*lib: @LD_START_STATIC_SPEC@ @LIBGCJ_SPEC@ @LD_FINISH_STATIC_SPEC@ @LIBMATHSPEC@ @LIBICONV@ @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@ %(libgcc) @LIBSTDCXXSPEC@ %(liborig)
+*lib: @LD_START_STATIC_SPEC@ @LIBGCJ_SPEC@ @LD_FINISH_STATIC_SPEC@ @LIBMATHSPEC@ @LDLIBICONV@ @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@ %(libgcc) @LIBSTDCXXSPEC@ %(liborig)
*jc1: @HASH_SYNC_SPEC@ @DIVIDESPEC@ @CHECKREFSPEC@ @JC1GCSPEC@ @EXCEPTIONSPEC@ @BACKTRACESPEC@ @IEEESPEC@ @ATOMICSPEC@ @LIBGCJ_BC_SPEC@ -fkeep-inline-functions