diff options
| author | rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-02-04 05:51:57 +0000 |
|---|---|---|
| committer | rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-02-04 05:51:57 +0000 |
| commit | a8dc4a292b02b0bcb7b9a87f46033729a592d10a (patch) | |
| tree | 61da8504716f32fbcb8d9fc8e45aabf76d5d8eda /libjava | |
| parent | cb6f50ce2caf83ac6c0908700851650590c9498a (diff) | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@169822 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 12 | ||||
| -rw-r--r-- | libjava/Makefile.in | 1 | ||||
| -rwxr-xr-x | libjava/configure | 9 | ||||
| -rw-r--r-- | libjava/configure.ac | 2 | ||||
| -rw-r--r-- | libjava/gcj/Makefile.in | 1 | ||||
| -rw-r--r-- | libjava/include/Makefile.in | 1 | ||||
| -rw-r--r-- | libjava/libgcj.spec.in | 2 | ||||
| -rw-r--r-- | libjava/testsuite/Makefile.in | 1 |
8 files changed, 25 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 0b6ba9681cf..fd297fd4b9b 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -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*. diff --git a/libjava/Makefile.in b/libjava/Makefile.in index f60b9e3b3fc..bf5ab9dcda6 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -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@ diff --git a/libjava/configure b/libjava/configure index 2fd20a4964e..481210d380a 100755 --- a/libjava/configure +++ b/libjava/configure @@ -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 : diff --git a/libjava/configure.ac b/libjava/configure.ac index e5310c1c955..a45cfc967d4 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/gcj/Makefile.in b/libjava/gcj/Makefile.in index 3273f4e331c..626bfb3af62 100644 --- a/libjava/gcj/Makefile.in +++ b/libjava/gcj/Makefile.in @@ -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@ diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in index edda77aa8de..1796971d146 100644 --- a/libjava/include/Makefile.in +++ b/libjava/include/Makefile.in @@ -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@ diff --git a/libjava/libgcj.spec.in b/libjava/libgcj.spec.in index 8d39532a4b8..22eec3dbc79 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 diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in index 56e390a003a..4af89562341 100644 --- a/libjava/testsuite/Makefile.in +++ b/libjava/testsuite/Makefile.in @@ -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@ |