OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix PR java/21206: Unrecognized option '-Wl,-rpath' for jv-convert

Browse Source 
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.

From-SVN: r169822
This commit is contained in:
Ralf Wildenhues 2011-02-04 05:51:57 +00:00 committed by Ralf Wildenhues
parent 084996f1d1
commit 4e6ad4226d
8 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libjava/ChangeLog
View File

@ -1,3 +1,15 @@
2011-02-04 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
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.
2011-02-02 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* configure.ac: Don't use libdl on mips-sgi-irix6*.

1
libjava/Makefile.in
View File

@ -592,6 +592,7 @@ JVM_JAR_ROOT_DIR = @JVM_JAR_ROOT_DIR@
JVM_ROOT_DIR = @JVM_ROOT_DIR@
LD = @LD@
LDFLAGS = @LDFLAGS@
LDLIBICONV = @LDLIBICONV@
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
LIBART_CFLAGS = @LIBART_CFLAGS@

9
libjava/configure vendored
View File

@ -674,6 +674,7 @@ GLIB_CFLAGS
GTK_LIBS
GTK_CFLAGS
PKG_CONFIG
LDLIBICONV
LTLIBICONV
LIBICONV
USING_GCC_FALSE
@ -13355,7 +13356,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 13358 "configure"
#line 13359 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -13461,7 +13462,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 13464 "configure"
#line 13465 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -19462,7 +19463,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then :
enableval=$enable_sjlj_exceptions; :
else
cat > conftest.$ac_ext << EOF
#line 19465 "configure"
#line 19466 "configure"
struct S { ~S(); };
void bar();
void foo()
@ -21993,6 +21994,8 @@ $as_echo "#define HAVE_TZNAME 1" >>confdefs.h
fi
fi
LDLIBICONV=`echo " $LIBICONV " | sed "s/${acl_cv_wl--Wl,}/ /g; s/,/ /g"`
for ac_func in gethostbyname_r
do :

2
libjava/configure.ac
View File

@ -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,

1
libjava/gcj/Makefile.in
View File

@ -175,6 +175,7 @@ JVM_JAR_ROOT_DIR = @JVM_JAR_ROOT_DIR@
JVM_ROOT_DIR = @JVM_ROOT_DIR@
LD = @LD@
LDFLAGS = @LDFLAGS@
LDLIBICONV = @LDLIBICONV@
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
LIBART_CFLAGS = @LIBART_CFLAGS@

1
libjava/include/Makefile.in
View File

@ -176,6 +176,7 @@ JVM_JAR_ROOT_DIR = @JVM_JAR_ROOT_DIR@
JVM_ROOT_DIR = @JVM_ROOT_DIR@
LD = @LD@
LDFLAGS = @LDFLAGS@
LDLIBICONV = @LDLIBICONV@
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
LIBART_CFLAGS = @LIBART_CFLAGS@

2
libjava/libgcj.spec.in
View File

@ -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

1
libjava/testsuite/Makefile.in
View File

@ -151,6 +151,7 @@ JVM_JAR_ROOT_DIR = @JVM_JAR_ROOT_DIR@
JVM_ROOT_DIR = @JVM_ROOT_DIR@
LD = @LD@
LDFLAGS = @LDFLAGS@
LDLIBICONV = @LDLIBICONV@
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
LIBART_CFLAGS = @LIBART_CFLAGS@