Remove libgcjdata hack. Fix jv-scan usage in dejagnu.

From-SVN: r42812

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e3c36853098386a81f3be42c6a34e1e915246569..3bffa79d6753912b73caf25a00293ca46588bda8 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2001-06-02  Anthony Green  <green@redhat.com>
+
+       * configure: Rebuild.
+       * configure.in: Remove data_start hack.
+       * libgcj.spec.in: Ditto.
+       * Makefile.in: Rebuild.
+       * Makefile.am: Ditto.
+       * libgcjdata.c: Remove.
+       
 2001-06-02  Anthony Green  <green@redhat.com>
 
        * configure: Rebuild.

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 3481f95a570e98c047ac4a0b78cbba3fcd5cbd75..e69cdc87bd5ba5c4eb0083736a645e28338e0e45 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -33,11 +33,6 @@ toolexeclib_LTLIBRARIES = libgcj.la $(cond_x_ltlibrary)
 toolexeclib_DATA = libgcj.spec
 data_DATA = libgcj.jar
 
-if NEEDS_DATA_START
-toolexeclib_LIBRARIES = libgcjdata.a
-libgcjdata_a_SOURCES = libgcjdata.c
-endif
-
 ## For now, only on native systems.  FIXME.
 if NATIVE
 bin_PROGRAMS = jv-convert gij

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index e1e90982ead9ef43333e7e5b16ef1416e3b128c6..688bb1c548d4cbbb51dcb6ad76319078c12e37ad 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -87,7 +87,6 @@ GCTESTSPEC = @GCTESTSPEC@
 HASH_SYNC_SPEC = @HASH_SYNC_SPEC@
 INCLTDL = @INCLTDL@
 JC1GCSPEC = @JC1GCSPEC@
-LIBDATASTARTSPEC = @LIBDATASTARTSPEC@
 LIBFFI = @LIBFFI@
 LIBGCJDEBUG = @LIBGCJDEBUG@
 LIBGCJTESTSPEC = @LIBGCJTESTSPEC@
@@ -134,9 +133,6 @@ toolexeclib_LTLIBRARIES = libgcj.la $(cond_x_ltlibrary)
 toolexeclib_DATA = libgcj.spec
 data_DATA = libgcj.jar
 
-@NEEDS_DATA_START_TRUE@toolexeclib_LIBRARIES = @NEEDS_DATA_START_TRUE@libgcjdata.a
-@NEEDS_DATA_START_TRUE@libgcjdata_a_SOURCES = @NEEDS_DATA_START_TRUE@libgcjdata.c
-
 @NATIVE_TRUE@bin_PROGRAMS = @NATIVE_TRUE@jv-convert gij
 
 bin_SCRIPTS = addr2name.awk
@@ -1178,7 +1174,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
 CONFIG_HEADER = ./include/config.h ./gcj/libgcj-config.h
 CONFIG_CLEAN_FILES =  libgcj.spec libgcj-test.spec
-LIBRARIES =  $(toolexeclib_LIBRARIES)
+LTLIBRARIES =  $(toolexeclib_LTLIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) -I./include -I./gcj
@@ -1189,10 +1185,6 @@ X_CFLAGS = @X_CFLAGS@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-libgcjdata_a_LIBADD = 
-@NEEDS_DATA_START_TRUE@libgcjdata_a_OBJECTS =  libgcjdata.$(OBJEXT)
-LTLIBRARIES =  $(toolexeclib_LTLIBRARIES)
-
 libgcj_la_OBJECTS =  prims.lo posix.lo jni.lo exception.lo resolve.lo \
 defineclass.lo interpret.lo name-finder.lo \
 gnu/gcj/convert/JIS0208_to_Unicode.lo \
@@ -1825,11 +1817,11 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/java/util/zip/ZipException.P .deps/java/util/zip/ZipFile.P \
 .deps/java/util/zip/ZipInputStream.P \
 .deps/java/util/zip/ZipOutputStream.P .deps/java/util/zip/natDeflater.P \
-.deps/java/util/zip/natInflater.P .deps/jni.P .deps/libgcjdata.P \
-.deps/name-finder.P .deps/no-threads.P .deps/nogc.P \
-.deps/posix-threads.P .deps/posix.P .deps/prims.P .deps/resolve.P
-SOURCES = $(libgcjdata_a_SOURCES) $(libgcj_la_SOURCES) $(EXTRA_libgcj_la_SOURCES) $(libgcjx_la_SOURCES) $(EXTRA_libgcjx_la_SOURCES) $(jv_convert_SOURCES) $(EXTRA_jv_convert_SOURCES) $(gij_SOURCES) $(gen_from_JIS_SOURCES) $(EXTRA_gen_from_JIS_SOURCES)
-OBJECTS = $(libgcjdata_a_OBJECTS) $(libgcj_la_OBJECTS) $(libgcjx_la_OBJECTS) $(jv_convert_OBJECTS) $(gij_OBJECTS) $(gen_from_JIS_OBJECTS)
+.deps/java/util/zip/natInflater.P .deps/jni.P .deps/name-finder.P \
+.deps/no-threads.P .deps/nogc.P .deps/posix-threads.P .deps/posix.P \
+.deps/prims.P .deps/resolve.P
+SOURCES = $(libgcj_la_SOURCES) $(EXTRA_libgcj_la_SOURCES) $(libgcjx_la_SOURCES) $(EXTRA_libgcjx_la_SOURCES) $(jv_convert_SOURCES) $(EXTRA_jv_convert_SOURCES) $(gij_SOURCES) $(gen_from_JIS_SOURCES) $(EXTRA_gen_from_JIS_SOURCES)
+OBJECTS = $(libgcj_la_OBJECTS) $(libgcjx_la_OBJECTS) $(jv_convert_OBJECTS) $(gij_OBJECTS) $(gen_from_JIS_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -1853,36 +1845,29 @@ libgcj.spec: $(top_builddir)/config.status libgcj.spec.in
 libgcj-test.spec: $(top_builddir)/config.status libgcj-test.spec.in
        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-mostlyclean-toolexeclibLIBRARIES:
+mostlyclean-toolexeclibLTLIBRARIES:
 
-clean-toolexeclibLIBRARIES:
-       -test -z "$(toolexeclib_LIBRARIES)" || rm -f $(toolexeclib_LIBRARIES)
+clean-toolexeclibLTLIBRARIES:
+       -test -z "$(toolexeclib_LTLIBRARIES)" || rm -f $(toolexeclib_LTLIBRARIES)
 
-distclean-toolexeclibLIBRARIES:
+distclean-toolexeclibLTLIBRARIES:
 
-maintainer-clean-toolexeclibLIBRARIES:
+maintainer-clean-toolexeclibLTLIBRARIES:
 
-install-toolexeclibLIBRARIES: $(toolexeclib_LIBRARIES)
+install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(toolexeclibdir)
-       @list='$(toolexeclib_LIBRARIES)'; for p in $$list; do \
-         if test -f $$p; then \
-           echo " $(INSTALL_DATA) $$p $(DESTDIR)$(toolexeclibdir)/$$p"; \
-           $(INSTALL_DATA) $$p $(DESTDIR)$(toolexeclibdir)/$$p; \
-         else :; fi; \
-       done
-       @$(POST_INSTALL)
-       @list='$(toolexeclib_LIBRARIES)'; for p in $$list; do \
+       @list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \
          if test -f $$p; then \
-           echo " $(RANLIB) $(DESTDIR)$(toolexeclibdir)/$$p"; \
-           $(RANLIB) $(DESTDIR)$(toolexeclibdir)/$$p; \
+           echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(toolexeclibdir)/$$p"; \
+           $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(toolexeclibdir)/$$p; \
          else :; fi; \
        done
 
-uninstall-toolexeclibLIBRARIES:
+uninstall-toolexeclibLTLIBRARIES:
        @$(NORMAL_UNINSTALL)
-       list='$(toolexeclib_LIBRARIES)'; for p in $$list; do \
-         rm -f $(DESTDIR)$(toolexeclibdir)/$$p; \
+       list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \
+         $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(toolexeclibdir)/$$p; \
        done
 
 # FIXME: We should only use cygpath when building on Windows,
@@ -1923,36 +1908,6 @@ distclean-libtool:
 
 maintainer-clean-libtool:
 
-libgcjdata.a: $(libgcjdata_a_OBJECTS) $(libgcjdata_a_DEPENDENCIES)
-       -rm -f libgcjdata.a
-       $(AR) cru libgcjdata.a $(libgcjdata_a_OBJECTS) $(libgcjdata_a_LIBADD)
-       $(RANLIB) libgcjdata.a
-
-mostlyclean-toolexeclibLTLIBRARIES:
-
-clean-toolexeclibLTLIBRARIES:
-       -test -z "$(toolexeclib_LTLIBRARIES)" || rm -f $(toolexeclib_LTLIBRARIES)
-
-distclean-toolexeclibLTLIBRARIES:
-
-maintainer-clean-toolexeclibLTLIBRARIES:
-
-install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES)
-       @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(toolexeclibdir)
-       @list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \
-         if test -f $$p; then \
-           echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(toolexeclibdir)/$$p"; \
-           $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(toolexeclibdir)/$$p; \
-         else :; fi; \
-       done
-
-uninstall-toolexeclibLTLIBRARIES:
-       @$(NORMAL_UNINSTALL)
-       list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \
-         $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(toolexeclibdir)/$$p; \
-       done
-
 mostlyclean-binPROGRAMS:
 
 clean-binPROGRAMS:
@@ -2273,8 +2228,7 @@ check-am: all-am
 check: check-recursive
 installcheck-am:
 installcheck: installcheck-recursive
-install-exec-am: install-toolexeclibLIBRARIES \
-               install-toolexeclibLTLIBRARIES install-binPROGRAMS \
+install-exec-am: install-toolexeclibLTLIBRARIES install-binPROGRAMS \
                install-binSCRIPTS install-toolexeclibDATA
        @$(NORMAL_INSTALL)
        $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
@@ -2286,20 +2240,17 @@ install-data: install-data-recursive
 install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-recursive
-uninstall-am: uninstall-toolexeclibLIBRARIES \
-               uninstall-toolexeclibLTLIBRARIES uninstall-binPROGRAMS \
+uninstall-am: uninstall-toolexeclibLTLIBRARIES uninstall-binPROGRAMS \
                uninstall-binSCRIPTS uninstall-dataDATA \
                uninstall-toolexeclibDATA
 uninstall: uninstall-recursive
-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
-               $(DATA)
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA)
 all-redirect: all-recursive
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs: installdirs-recursive
 installdirs-am:
-       $(mkinstalldirs)  $(DESTDIR)$(toolexeclibdir) \
-               $(DESTDIR)$(toolexeclibdir) $(DESTDIR)$(bindir) \
+       $(mkinstalldirs)  $(DESTDIR)$(toolexeclibdir) $(DESTDIR)$(bindir) \
                $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) \
                $(DESTDIR)$(toolexeclibdir)
 
@@ -2315,33 +2266,30 @@ distclean-generic:
        -rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-toolexeclibLIBRARIES mostlyclean-compile \
-               mostlyclean-libtool mostlyclean-toolexeclibLTLIBRARIES \
-               mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \
-               mostlyclean-tags mostlyclean-depend mostlyclean-generic
+mostlyclean-am:  mostlyclean-toolexeclibLTLIBRARIES mostlyclean-compile \
+               mostlyclean-libtool mostlyclean-binPROGRAMS \
+               mostlyclean-noinstPROGRAMS mostlyclean-tags \
+               mostlyclean-depend mostlyclean-generic
 
 mostlyclean: mostlyclean-recursive
 
-clean-am:  clean-toolexeclibLIBRARIES clean-compile clean-libtool \
-               clean-toolexeclibLTLIBRARIES clean-binPROGRAMS \
-               clean-noinstPROGRAMS clean-tags clean-depend \
-               clean-generic mostlyclean-am clean-local
+clean-am:  clean-toolexeclibLTLIBRARIES clean-compile clean-libtool \
+               clean-binPROGRAMS clean-noinstPROGRAMS clean-tags \
+               clean-depend clean-generic mostlyclean-am clean-local
 
 clean: clean-recursive
 
-distclean-am:  distclean-toolexeclibLIBRARIES distclean-compile \
-               distclean-libtool distclean-toolexeclibLTLIBRARIES \
-               distclean-binPROGRAMS distclean-noinstPROGRAMS \
-               distclean-tags distclean-depend distclean-generic \
-               clean-am
+distclean-am:  distclean-toolexeclibLTLIBRARIES distclean-compile \
+               distclean-libtool distclean-binPROGRAMS \
+               distclean-noinstPROGRAMS distclean-tags \
+               distclean-depend distclean-generic clean-am
        -rm -f libtool
 
 distclean: distclean-recursive
        -rm -f config.status
 
-maintainer-clean-am:  maintainer-clean-toolexeclibLIBRARIES \
+maintainer-clean-am:  maintainer-clean-toolexeclibLTLIBRARIES \
                maintainer-clean-compile maintainer-clean-libtool \
-               maintainer-clean-toolexeclibLTLIBRARIES \
                maintainer-clean-binPROGRAMS \
                maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
                maintainer-clean-depend maintainer-clean-generic \
@@ -2352,25 +2300,23 @@ maintainer-clean-am:  maintainer-clean-toolexeclibLIBRARIES \
 maintainer-clean: maintainer-clean-recursive
        -rm -f config.status
 
-.PHONY: mostlyclean-toolexeclibLIBRARIES distclean-toolexeclibLIBRARIES \
-clean-toolexeclibLIBRARIES maintainer-clean-toolexeclibLIBRARIES \
-uninstall-toolexeclibLIBRARIES install-toolexeclibLIBRARIES \
+.PHONY: mostlyclean-toolexeclibLTLIBRARIES \
+distclean-toolexeclibLTLIBRARIES clean-toolexeclibLTLIBRARIES \
+maintainer-clean-toolexeclibLTLIBRARIES \
+uninstall-toolexeclibLTLIBRARIES install-toolexeclibLTLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool \
-mostlyclean-toolexeclibLTLIBRARIES distclean-toolexeclibLTLIBRARIES \
-clean-toolexeclibLTLIBRARIES maintainer-clean-toolexeclibLTLIBRARIES \
-uninstall-toolexeclibLTLIBRARIES install-toolexeclibLTLIBRARIES \
-mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
-maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
-mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
-clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
-uninstall-binSCRIPTS install-binSCRIPTS uninstall-dataDATA \
-install-dataDATA uninstall-toolexeclibDATA install-toolexeclibDATA \
-install-data-recursive uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+clean-libtool maintainer-clean-libtool mostlyclean-binPROGRAMS \
+distclean-binPROGRAMS clean-binPROGRAMS maintainer-clean-binPROGRAMS \
+uninstall-binPROGRAMS install-binPROGRAMS mostlyclean-noinstPROGRAMS \
+distclean-noinstPROGRAMS clean-noinstPROGRAMS \
+maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \
+uninstall-dataDATA install-dataDATA uninstall-toolexeclibDATA \
+install-toolexeclibDATA install-data-recursive uninstall-data-recursive \
+install-exec-recursive uninstall-exec-recursive installdirs-recursive \
+uninstalldirs-recursive all-recursive check-recursive \
+installcheck-recursive info-recursive dvi-recursive \
+mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
 distclean-tags clean-tags maintainer-clean-tags distdir \
 mostlyclean-depend distclean-depend clean-depend \

diff --git a/libjava/configure.in b/libjava/configure.in
index 44c187bfb304c0ef6a846136382809a9772a050e..06e505b9887ca211dd9e7f91e62c5584c41c3a5e 100644 (file)
--- a/libjava/configure.in
+++ b/libjava/configure.in
@@ -147,16 +147,6 @@ fi
 AC_LANG_RESTORE
 AC_MSG_RESULT($ac_exception_model_name)
 
-AC_MSG_CHECKING([for data_start])
-LIBDATASTARTSPEC=
-NEEDS_DATA_START=
-AC_TRY_LINK([extern int data_start;], [return ((int) &data_start);],
-  [AC_MSG_RESULT(found it)],
-  [LIBDATASTARTSPEC="-u data_start libgcjdata.a%s"
-   NEEDS_DATA_START=yes        
-   AC_MSG_RESULT(missing)])
-AC_SUBST(LIBDATASTARTSPEC)
-
 dnl See if the user wants to disable java.net.  This is the mildly
 dnl ugly way that we admit that target-side configuration sucks.
 AC_ARG_ENABLE(java-net,

diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in
index 5dbfe57610807e3cc9d11f7bc1900d1f2fc7d85d..47be28b0891da277b3126284a01173425ef18d5a 100644 (file)
--- a/libjava/gcj/Makefile.in
+++ b/libjava/gcj/Makefile.in
@@ -88,7 +88,6 @@ GCTESTSPEC = @GCTESTSPEC@
 HASH_SYNC_SPEC = @HASH_SYNC_SPEC@
 INCLTDL = @INCLTDL@
 JC1GCSPEC = @JC1GCSPEC@
-LIBDATASTARTSPEC = @LIBDATASTARTSPEC@
 LIBFFI = @LIBFFI@
 LIBFFIINCS = @LIBFFIINCS@
 LIBGCJDEBUG = @LIBGCJDEBUG@

diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in
index a03b6ef3b5b18b0a2c45fa00aeeb5d5fd496f6c9..993dcffbd49a0d9eb3bb66ca51cd465a8cce433c 100644 (file)
--- a/libjava/include/Makefile.in
+++ b/libjava/include/Makefile.in
@@ -88,7 +88,6 @@ GCTESTSPEC = @GCTESTSPEC@
 HASH_SYNC_SPEC = @HASH_SYNC_SPEC@
 INCLTDL = @INCLTDL@
 JC1GCSPEC = @JC1GCSPEC@
-LIBDATASTARTSPEC = @LIBDATASTARTSPEC@
 LIBFFI = @LIBFFI@
 LIBFFIINCS = @LIBFFIINCS@
 LIBGCJDEBUG = @LIBGCJDEBUG@

diff --git a/libjava/libgcj.spec.in b/libjava/libgcj.spec.in
index 90e4883340294348340611fd644a26fdb4c28921..c4163ae069d193640b0740e343032d5a9b0097e5 100644 (file)
--- a/libjava/libgcj.spec.in
+++ b/libjava/libgcj.spec.in
@@ -7,10 +7,3 @@
 *lib: -lgcj -lm @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@ %(libgcc) %(liborig)
 
 *jc1: @HASH_SYNC_SPEC@ @DIVIDESPEC@ @JC1GCSPEC@ @EXCEPTIONSPEC@
-
-#
-# On some systems we force in a data_start symbol so that the GC will work
-# with shared libraries.
-# 
-%rename startfile startfileorig
-*startfile: %(startfileorig) @LIBDATASTARTSPEC@

diff --git a/libjava/libgcjdata.c b/libjava/libgcjdata.c
deleted file mode 100644 (file)
index 94d7994..0000000
--- a/libjava/libgcjdata.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Copyright (C) 1998, 1999  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-/* Some systems need data_start defined so the GC be built as a shared
-   library.  */
-
-int data_start = 0;

diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in
index c58158b5c29e652ab7a87e6cd7300dcfe0bb0a09..bb778fb4489c98c84f70b6575a7a2bb49e6ce967 100644 (file)
--- a/libjava/testsuite/Makefile.in
+++ b/libjava/testsuite/Makefile.in
@@ -88,7 +88,6 @@ GCTESTSPEC = @GCTESTSPEC@
 HASH_SYNC_SPEC = @HASH_SYNC_SPEC@
 INCLTDL = @INCLTDL@
 JC1GCSPEC = @JC1GCSPEC@
-LIBDATASTARTSPEC = @LIBDATASTARTSPEC@
 LIBFFI = @LIBFFI@
 LIBFFIINCS = @LIBFFIINCS@
 LIBGCJDEBUG = @LIBGCJDEBUG@

diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index 22ec065f1fb7aef5ffd6f6638b0367359067d189..4b797bfd04e12a4d17d4b5518f9246e68dded055 100644 (file)
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -540,18 +540,13 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e
     # Find name to use for --main, and name of all class files.
     set jvscan [find_jvscan]
     verbose "jvscan is $jvscan"
-    # We insulate ourselves from the user's locale by forcing the
-    # encoding on jvscan.
-    set jvscan "compiler=$jvscan additional_flags=--encoding=UTF-8"
     set main_name [string trim \
                     [prune_warnings \
-                       [libjava_tcompile $srcfile "" none \
-                          "$jvscan additional_flags=--print-main"]]]
+                       [lindex [local_exec "$jvscan --encoding=UTF-8 $srcfile --print-main" "" "" 300] 1]]]
     verbose "main name is $main_name"
     set class_out [string trim \
                     [prune_warnings \
-                       [libjava_tcompile $srcfile "" none \
-                          "$jvscan additional_flags=--list-class"]]]
+                       [lindex [local_exec "$jvscan --encoding=UTF-8 $srcfile --list-class" "" "" 300] 1]]]
     verbose "class list is $class_out"
 
     if {[string match "*parse error*" $main_name]