diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 65506cc13f52..7711ec8e1a7f 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -215,7 +215,7 @@ java/lang/ClassLoader.h: java/lang/ClassLoader.class libgcj.zip $(basename $<) ## Our internal main program needs to be able to create a FirstThread. -java/lang/FirstThread.h: java/lang/FirstThread.class libgcj.zip +gnu/gcj/runtime/FirstThread.h: gnu/gcj/runtime/FirstThread.class libgcj.zip $(GCJH) -classpath $(top_builddir) \ -friend 'void JvRunMain (jclass, int, const char **);' \ -friend 'void _Jv_RunMain (const char*, int, const char **);' \ @@ -521,6 +521,7 @@ gnu/gcj/io/DefaultMimeTypes.java \ gnu/gcj/io/MimeTypes.java \ gnu/gcj/jni/NativeThread.java \ gnu/gcj/runtime/VMClassLoader.java \ +gnu/gcj/runtime/FirstThread.java \ gnu/gcj/text/BaseBreakIterator.java \ gnu/gcj/text/CharacterBreakIterator.java \ gnu/gcj/text/LineBreakIterator.java \ @@ -611,7 +612,6 @@ java/lang/Double.java \ java/lang/Error.java \ java/lang/Exception.java \ java/lang/ExceptionInInitializerError.java \ -java/lang/FirstThread.java \ java/lang/Float.java \ java/lang/IllegalAccessError.java \ java/lang/IllegalAccessException.java \ @@ -804,6 +804,7 @@ gnu/gcj/convert/natInput_SJIS.cc \ gnu/gcj/convert/natOutput_EUCJIS.cc \ gnu/gcj/convert/natOutput_SJIS.cc \ gnu/gcj/jni/natNativeThread.cc \ +gnu/gcj/runtime/natFirstThread.cc \ java/io/natFile.cc \ java/io/natFileDescriptor.cc \ java/lang/natCharacter.cc \ @@ -811,7 +812,6 @@ java/lang/natClass.cc \ java/lang/natClassLoader.cc \ java/lang/natConcreteProcess.cc \ java/lang/natDouble.cc \ -java/lang/natFirstThread.cc \ java/lang/natFloat.cc \ java/lang/natMath.cc \ java/lang/natObject.cc \ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 6fd036605a7a..2bfaeb0222e7 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -82,8 +82,10 @@ GCINCS = @GCINCS@ GCLIBS = @GCLIBS@ GCOBJS = @GCOBJS@ GCSPEC = @GCSPEC@ +GCTESTSPEC = @GCTESTSPEC@ INCLTDL = @INCLTDL@ LIBDATASTARTSPEC = @LIBDATASTARTSPEC@ +LIBGCJTESTSPEC = @LIBGCJTESTSPEC@ LIBGCJ_CFLAGS = @LIBGCJ_CFLAGS@ LIBGCJ_CXXFLAGS = @LIBGCJ_CXXFLAGS@ LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@ @@ -107,6 +109,7 @@ ZDEPS = @ZDEPS@ ZINCS = @ZINCS@ ZLIBS = @ZLIBS@ ZLIBSPEC = @ZLIBSPEC@ +ZLIBTESTSPEC = @ZLIBTESTSPEC@ here = @here@ libgcj_basedir = @libgcj_basedir@ @@ -330,6 +333,7 @@ gnu/gcj/io/DefaultMimeTypes.java \ gnu/gcj/io/MimeTypes.java \ gnu/gcj/jni/NativeThread.java \ gnu/gcj/runtime/VMClassLoader.java \ +gnu/gcj/runtime/FirstThread.java \ gnu/gcj/text/BaseBreakIterator.java \ gnu/gcj/text/CharacterBreakIterator.java \ gnu/gcj/text/LineBreakIterator.java \ @@ -420,7 +424,6 @@ java/lang/Double.java \ java/lang/Error.java \ java/lang/Exception.java \ java/lang/ExceptionInInitializerError.java \ -java/lang/FirstThread.java \ java/lang/Float.java \ java/lang/IllegalAccessError.java \ java/lang/IllegalAccessException.java \ @@ -613,6 +616,7 @@ gnu/gcj/convert/natInput_SJIS.cc \ gnu/gcj/convert/natOutput_EUCJIS.cc \ gnu/gcj/convert/natOutput_SJIS.cc \ gnu/gcj/jni/natNativeThread.cc \ +gnu/gcj/runtime/natFirstThread.cc \ java/io/natFile.cc \ java/io/natFileDescriptor.cc \ java/lang/natCharacter.cc \ @@ -620,7 +624,6 @@ java/lang/natClass.cc \ java/lang/natClassLoader.cc \ java/lang/natConcreteProcess.cc \ java/lang/natDouble.cc \ -java/lang/natFirstThread.cc \ java/lang/natFloat.cc \ java/lang/natMath.cc \ java/lang/natObject.cc \ @@ -697,7 +700,7 @@ cygnus_hack = ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = ./include/config.h -CONFIG_CLEAN_FILES = libgcj.spec +CONFIG_CLEAN_FILES = libgcj.spec libgcj-test.spec LIBRARIES = $(toolexeclib_LIBRARIES) @@ -733,12 +736,13 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DATA = $(data_DATA) $(toolexeclib_DATA) DIST_COMMON = README COPYING.LIB ChangeLog Makefile.am Makefile.in NEWS \ -THANKS acinclude.m4 aclocal.m4 configure configure.in libgcj.spec.in +THANKS acinclude.m4 aclocal.m4 configure configure.in \ +libgcj-test.spec.in libgcj.spec.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best DIST_SUBDIRS = @DIRLTDL@ testsuite gcj include @DIRLTDL@ gcj include DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ @@ -764,6 +768,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/gnu/gcj/protocol/http/Handler.P \ .deps/gnu/gcj/protocol/jar/Connection.P \ .deps/gnu/gcj/protocol/jar/Handler.P \ +.deps/gnu/gcj/runtime/FirstThread.P \ .deps/gnu/gcj/runtime/VMClassLoader.P \ .deps/gnu/gcj/text/BaseBreakIterator.P \ .deps/gnu/gcj/text/CharacterBreakIterator.P \ @@ -816,8 +821,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/java/lang/Compiler.P .deps/java/lang/ConcreteProcess.P \ .deps/java/lang/Double.P .deps/java/lang/Error.P \ .deps/java/lang/Exception.P \ -.deps/java/lang/ExceptionInInitializerError.P \ -.deps/java/lang/FirstThread.P .deps/java/lang/Float.P \ +.deps/java/lang/ExceptionInInitializerError.P .deps/java/lang/Float.P \ .deps/java/lang/IllegalAccessError.P \ .deps/java/lang/IllegalAccessException.P \ .deps/java/lang/IllegalArgumentException.P \ @@ -961,6 +965,8 @@ $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) cd $(srcdir) && $(AUTOCONF) libgcj.spec: $(top_builddir)/config.status libgcj.spec.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status +libgcj-test.spec: $(top_builddir)/config.status libgcj-test.spec.in + cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status mostlyclean-toolexeclibLIBRARIES: @@ -1282,7 +1288,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -1512,7 +1518,7 @@ java/lang/ClassLoader.h: java/lang/ClassLoader.class libgcj.zip -friend 'jclass _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader);' \ $(basename $<) -java/lang/FirstThread.h: java/lang/FirstThread.class libgcj.zip +gnu/gcj/runtime/FirstThread.h: gnu/gcj/runtime/FirstThread.class libgcj.zip $(GCJH) -classpath $(top_builddir) \ -friend 'void JvRunMain (jclass, int, const char **);' \ -friend 'void _Jv_RunMain (const char*, int, const char **);' \ diff --git a/libjava/configure.host b/libjava/configure.host index 6e8aec5b91fb..38d927d09c60 100644 --- a/libjava/configure.host +++ b/libjava/configure.host @@ -58,8 +58,10 @@ case "${host}" in enable_getenv_properties_default=no ;; i686-*|i586-*|i486-*|i386-*) - libgcj_flags="${libgcj_flags} -ffloat-store -D__NO_MATH_INLINES" + libgcj_flags="${libgcj_flags} -ffloat-store" libgcj_interpreter=yes + libgcj_cxxflags="-D__NO_MATH_INLINES" + libgcj_cflags="-D__NO_MATH_INLINES" DIVIDESPEC=-fno-use-divide-subroutine ;; sparc-*) diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in index 4acb3dd07671..060495d0dece 100644 --- a/libjava/gcj/Makefile.in +++ b/libjava/gcj/Makefile.in @@ -83,8 +83,10 @@ GCINCS = @GCINCS@ GCLIBS = @GCLIBS@ GCOBJS = @GCOBJS@ GCSPEC = @GCSPEC@ +GCTESTSPEC = @GCTESTSPEC@ INCLTDL = @INCLTDL@ LIBDATASTARTSPEC = @LIBDATASTARTSPEC@ +LIBGCJTESTSPEC = @LIBGCJTESTSPEC@ LIBGCJ_CFLAGS = @LIBGCJ_CFLAGS@ LIBGCJ_CXXFLAGS = @LIBGCJ_CXXFLAGS@ LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@ @@ -108,6 +110,7 @@ ZDEPS = @ZDEPS@ ZINCS = @ZINCS@ ZLIBS = @ZLIBS@ ZLIBSPEC = @ZLIBSPEC@ +ZLIBTESTSPEC = @ZLIBTESTSPEC@ here = @here@ libgcj_basedir = @libgcj_basedir@ @@ -125,7 +128,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -194,7 +197,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff --git a/libjava/java/lang/FirstThread.java b/libjava/gnu/gcj/runtime/FirstThread.java similarity index 97% rename from libjava/java/lang/FirstThread.java rename to libjava/gnu/gcj/runtime/FirstThread.java index 135a9131d9e6..643d153b44ed 100644 --- a/libjava/java/lang/FirstThread.java +++ b/libjava/gnu/gcj/runtime/FirstThread.java @@ -8,7 +8,7 @@ This software is copyrighted work licensed under the terms of the Libgcj License. Please consult the file "LIBGCJ_LICENSE" for details. */ -package java.lang; +package gnu.gcj.runtime; /** * @author Tom Tromey diff --git a/libjava/java/lang/natFirstThread.cc b/libjava/gnu/gcj/runtime/natFirstThread.cc similarity index 94% rename from libjava/java/lang/natFirstThread.cc rename to libjava/gnu/gcj/runtime/natFirstThread.cc index 69b978da81b9..2b8f8d4a5109 100644 --- a/libjava/java/lang/natFirstThread.cc +++ b/libjava/gnu/gcj/runtime/natFirstThread.cc @@ -15,7 +15,7 @@ details. */ #include #include -#include +#include #include #include #include @@ -27,7 +27,7 @@ details. */ typedef void main_func (jobject); void -java::lang::FirstThread::run (void) +gnu::gcj::runtime::FirstThread::run (void) { Utf8Const* main_signature = _Jv_makeUtf8Const ("([Ljava.lang.String;)V", 22); Utf8Const* main_name = _Jv_makeUtf8Const ("main", 4); diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in index f60902e67b6d..f753c745f6eb 100644 --- a/libjava/include/Makefile.in +++ b/libjava/include/Makefile.in @@ -83,8 +83,10 @@ GCINCS = @GCINCS@ GCLIBS = @GCLIBS@ GCOBJS = @GCOBJS@ GCSPEC = @GCSPEC@ +GCTESTSPEC = @GCTESTSPEC@ INCLTDL = @INCLTDL@ LIBDATASTARTSPEC = @LIBDATASTARTSPEC@ +LIBGCJTESTSPEC = @LIBGCJTESTSPEC@ LIBGCJ_CFLAGS = @LIBGCJ_CFLAGS@ LIBGCJ_CXXFLAGS = @LIBGCJ_CXXFLAGS@ LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@ @@ -108,6 +110,7 @@ ZDEPS = @ZDEPS@ ZINCS = @ZINCS@ ZLIBS = @ZLIBS@ ZLIBSPEC = @ZLIBSPEC@ +ZLIBTESTSPEC = @ZLIBTESTSPEC@ here = @here@ libgcj_basedir = @libgcj_basedir@ @@ -120,7 +123,7 @@ DIST_COMMON = ./stamp-h.in Makefile.am Makefile.in config.h.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -176,7 +179,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff --git a/libjava/prims.cc b/libjava/prims.cc index 5d72f15de650..2c5c464e1ed8 100644 --- a/libjava/prims.cc +++ b/libjava/prims.cc @@ -38,7 +38,7 @@ details. */ #include #include #include -#include +#include #include #include #include @@ -850,7 +850,8 @@ JvRunMain (jclass klass, int argc, const char **argv) arg_vec = JvConvertArgv (argc - 1, argv + 1); main_group = new java::lang::ThreadGroup (23); - main_thread = new java::lang::FirstThread (main_group, klass, arg_vec); + main_thread = new gnu::gcj::runtime::FirstThread (main_group, + klass, arg_vec); main_thread->start(); _Jv_ThreadWait (); @@ -873,9 +874,9 @@ _Jv_RunMain (const char *class_name, int argc, const char **argv) arg_vec = JvConvertArgv (argc - 1, argv + 1); main_group = new java::lang::ThreadGroup (23); - main_thread = new java::lang::FirstThread (main_group, - JvNewStringLatin1 (class_name), - arg_vec); + main_thread = new gnu::gcj::runtime::FirstThread (main_group, + JvNewStringLatin1 (class_name), + arg_vec); main_thread->start(); _Jv_ThreadWait (); diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in index 57cf223f4a98..614f14f6554f 100644 --- a/libjava/testsuite/Makefile.in +++ b/libjava/testsuite/Makefile.in @@ -83,8 +83,10 @@ GCINCS = @GCINCS@ GCLIBS = @GCLIBS@ GCOBJS = @GCOBJS@ GCSPEC = @GCSPEC@ +GCTESTSPEC = @GCTESTSPEC@ INCLTDL = @INCLTDL@ LIBDATASTARTSPEC = @LIBDATASTARTSPEC@ +LIBGCJTESTSPEC = @LIBGCJTESTSPEC@ LIBGCJ_CFLAGS = @LIBGCJ_CFLAGS@ LIBGCJ_CXXFLAGS = @LIBGCJ_CXXFLAGS@ LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@ @@ -108,6 +110,7 @@ ZDEPS = @ZDEPS@ ZINCS = @ZINCS@ ZLIBS = @ZLIBS@ ZLIBSPEC = @ZLIBSPEC@ +ZLIBTESTSPEC = @ZLIBTESTSPEC@ here = @here@ libgcj_basedir = @libgcj_basedir@ @@ -133,7 +136,7 @@ DIST_COMMON = ChangeLog Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -161,7 +164,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \