diff options
| author | Dave Korn <dave.korn.cygwin@gmail.com> | 2010-03-21 19:41:37 +0000 |
|---|---|---|
| committer | Dave Korn <davek@gcc.gnu.org> | 2010-03-21 19:41:37 +0000 |
| commit | 474b97ce0ff47918ce4fb78b4ee970d4009ecf02 (patch) | |
| tree | 3802590e4709444b1219175a10f94cc33e72acb9 /libjava/gcj | |
| parent | 713812e2445496115c6cc9d789b2662cdd2225dc (diff) | |
| download | gcc-474b97ce0ff47918ce4fb78b4ee970d4009ecf02.zip gcc-474b97ce0ff47918ce4fb78b4ee970d4009ecf02.tar.gz gcc-474b97ce0ff47918ce4fb78b4ee970d4009ecf02.tar.bz2 | |
re PR target/42811 (java.lang.ExceptionInInitializerError in ecj1)
PR target/42811
* libjava/configure.ac (DLLTOOL): Call AC_CHECK_TOOL.
(libgcj_sublib_core_extra_deps): New host-dependent configure var.
(LIBGCJ_SUBLIB_CORE_EXTRA_DEPS): AC_SUBST it.
* libjava/configure.host (libgcj_sublib_core_extra_deps): Define
appropriately on Cygwin and MinGW.
(libgcj_sublib_core_extra_deps): Add libgcj-noncore-dummy import
stub library on Cygwin and MinGW.
* libjava/Makefile.am (LIBJAVA_CORE_EXTRA): Import AC_SUBST'd
LIBGCJ_SUBLIB_CORE_EXTRA_DEPS if building sublibs, else define empty.
(libgcj_la_DEPENDENCIES): Use it.
(DLL_VERSION): New makefile macro.
(libgcj-noncore-dummy.dll.a): New build rule for dummy import stub
library.
(libgcj_noncore_la_LIBADD): Trim superfluous convenience libs.
(AM_MAKEFLAGS): Add DLLTOOL recursive propagation.
* libjava/libgcj-noncore-dummy.def: New file.
* libjava/Makefile.in: Regenerate.
* libjava/include/Makefile.in: Likewise.
* libjava/testsuite/Makefile.in: Likewise.
* libjava/configure: Likewise.
* libjava/gcj/Makefile.in: Likewise.
From-SVN: r157606
Diffstat (limited to 'libjava/gcj')
| -rw-r--r-- | libjava/gcj/Makefile.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in index 5552439..e73ef0e 100644 --- a/libjava/gcj/Makefile.in +++ b/libjava/gcj/Makefile.in @@ -124,6 +124,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DIRLTDL = @DIRLTDL@ DIVIDESPEC = @DIVIDESPEC@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -191,6 +192,7 @@ LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@ LIBGCJ_LD_SYMBOLIC = @LIBGCJ_LD_SYMBOLIC@ LIBGCJ_LD_SYMBOLIC_FUNCTIONS = @LIBGCJ_LD_SYMBOLIC_FUNCTIONS@ LIBGCJ_SPEC = @LIBGCJ_SPEC@ +LIBGCJ_SUBLIB_CORE_EXTRA_DEPS = @LIBGCJ_SUBLIB_CORE_EXTRA_DEPS@ LIBGCJ_SUBLIB_LTFLAGS = @LIBGCJ_SUBLIB_LTFLAGS@ LIBICONV = @LIBICONV@ LIBLTDL = @LIBLTDL@ |