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

From-SVN: r42812

libjava/ChangeLog

 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.
 	* configure.in (LIBFFIINCS, LIBFFI): Introduce.  Add
 	--without-libffi option.  Tweak --disable-java-net processing.
 	* Makefile.in: Rebuild.

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

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,

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@

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@

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@

libjava/libgcjdata.c

-/* 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;

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@

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]