1999-04-07 16:42:40 +02:00
|
|
|
dnl Process this with autoconf to create configure
|
|
|
|
AC_INIT(java/lang/System.java)
|
|
|
|
|
[multiple changes]
Fri May 28 22:20:03 1999 Anthony Green <green@cygnus.com>
* java/lang/fdlibm.h: Don't use __uint32_t. Include mprec.h.
* java/lang/e_log.c: Don't use __uint32_t.
1999-05-27 Eric Christopher <echristo@cygnus.com>
* configure: Rebuilt
* configure.in: Fixed ISO C9X and namespace collision with __uint32_t
* acconfig.h: Rebuilt
* include/config.h.in: Rebuilt
* java/lang/mprec.h, java/lang/e_acos.c, java/lang/e_asin.c,
java/lang/e_atan2.c, java/lang/e_exp.c, java/lang/e_fmod.c,
e_log.c, java/lang/e_pow.c, java/lang/e_rem_pio2.c,
java/lang/e_remainder.c, java/lang/e_sqrt.c, java/lang/fdlibm.h,
k_tan.c, java/lang/mprec.h, java/lang/s_atan.c,
java/lang/s_ceil.c, java/lang/s_copysign.c, java/lang/s_fabs.c,
s_floor.c, java/lang/s_rint.c, java/lang/sf_rint.c: Fixed ISO C9X
and namespace collision with __uint32_t
From-SVN: r27729
1999-06-24 22:06:09 +02:00
|
|
|
dnl Can't be done in LIBGCJ_CONFIGURE because that confuses automake.
|
1999-04-07 16:42:40 +02:00
|
|
|
AC_CONFIG_AUX_DIR(..)
|
|
|
|
|
|
|
|
AC_CANONICAL_SYSTEM
|
|
|
|
|
|
|
|
dnl We use these options to decide which functions to include.
|
|
|
|
AC_ARG_WITH(target-subdir,
|
[multiple changes]
Mon Aug 9 18:33:38 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* Makefile: Rebuilt.
* Makefile.am (toolexeclibdir): Add $(MULTISUBDIR) even for native
builds.
* java/net/natPlainSocketImpl.cc: Include <sys/select.h> only if
present.
* configure: Rebuilt.
* configure.in: Properly align --help output, fix capitalization
and punctuation.
* acinclude.m4: Likewise.
1999-08-09 Kresten Krab Thorup <krab@gnu.org>
* include/javaprims.h (_Jv_word, _Jv_word2): New types.
* include/java-interp.h (_Jv_InterpMethodInvocation): Use _Jv_word.
(_Jv_callInterpretedMethod): Unused. Remove.
(_Jv_InterpMethod::run,run_normal,run_synch_object,run_synch_class):
Use ffi_raw.
* include/java-cpool.h (_Jv_get, _Jv_put): Remove.
(_Jv_{store,load}{Indexes,Int,Float,Long,Double}): Use _Jv_word.
* boehm.cc (_Jv_MarkObj): Use _Jv_word.
* interpret.cc: use _Jv_word.
* defineclass.cc: use_Jv_word.
* resolve.cc: Use _Jv_word.
(_Jv_ResolvePoolEntry): Return _Jv_word.
* java/lang/Class.h (_Jv_Constants): Use _Jv_word for cpool.
* java/lang/natClassLoader.cc (_Jv_InternClassStrings): Use _Jv_word.
* interpret.cc (gnu::gcj::runtime::MethodInvocation::continue1):
Change comment.
From-SVN: r28641
1999-08-10 07:32:23 +02:00
|
|
|
[ --with-target-subdir=SUBDIR
|
1999-10-15 08:07:41 +02:00
|
|
|
configuring in a subdirectory])
|
1999-04-07 16:42:40 +02:00
|
|
|
AC_ARG_WITH(cross-host,
|
[multiple changes]
Mon Aug 9 18:33:38 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* Makefile: Rebuilt.
* Makefile.am (toolexeclibdir): Add $(MULTISUBDIR) even for native
builds.
* java/net/natPlainSocketImpl.cc: Include <sys/select.h> only if
present.
* configure: Rebuilt.
* configure.in: Properly align --help output, fix capitalization
and punctuation.
* acinclude.m4: Likewise.
1999-08-09 Kresten Krab Thorup <krab@gnu.org>
* include/javaprims.h (_Jv_word, _Jv_word2): New types.
* include/java-interp.h (_Jv_InterpMethodInvocation): Use _Jv_word.
(_Jv_callInterpretedMethod): Unused. Remove.
(_Jv_InterpMethod::run,run_normal,run_synch_object,run_synch_class):
Use ffi_raw.
* include/java-cpool.h (_Jv_get, _Jv_put): Remove.
(_Jv_{store,load}{Indexes,Int,Float,Long,Double}): Use _Jv_word.
* boehm.cc (_Jv_MarkObj): Use _Jv_word.
* interpret.cc: use _Jv_word.
* defineclass.cc: use_Jv_word.
* resolve.cc: Use _Jv_word.
(_Jv_ResolvePoolEntry): Return _Jv_word.
* java/lang/Class.h (_Jv_Constants): Use _Jv_word for cpool.
* java/lang/natClassLoader.cc (_Jv_InternClassStrings): Use _Jv_word.
* interpret.cc (gnu::gcj::runtime::MethodInvocation::continue1):
Change comment.
From-SVN: r28641
1999-08-10 07:32:23 +02:00
|
|
|
[ --with-cross-host=HOST configuring with a cross compiler])
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
LIBGCJ_CONFIGURE(.)
|
|
|
|
|
|
|
|
AM_CONFIG_HEADER(include/config.h)
|
|
|
|
|
2000-01-17 20:22:20 +01:00
|
|
|
# Only use libltdl for native builds.
|
|
|
|
if test -z "${with_cross_host}"; then
|
|
|
|
AC_LIBLTDL_CONVENIENCE
|
|
|
|
AC_LIBTOOL_DLOPEN
|
|
|
|
DIRLTDL=libltdl
|
|
|
|
AC_DEFINE(USE_LTDL)
|
|
|
|
# Sigh. Libtool's macro doesn't do the right thing.
|
|
|
|
INCLTDL="-I\$(top_srcdir)/libltdl $INCLTDL"
|
|
|
|
fi
|
|
|
|
AC_SUBST(INCLTDL)
|
|
|
|
AC_SUBST(LIBLTDL)
|
|
|
|
AC_SUBST(DIRLTDL)
|
1999-04-26 16:50:15 +02:00
|
|
|
AM_PROG_LIBTOOL
|
2000-01-18 06:33:35 +01:00
|
|
|
AC_CONFIG_SUBDIRS($DIRLTDL)
|
1999-04-26 16:50:15 +02:00
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
if test -z "$with_target_subdir" || test "$with_target_subdir" = "."; then
|
|
|
|
COMPPATH=.
|
|
|
|
else
|
|
|
|
COMPPATH=..
|
|
|
|
fi
|
|
|
|
AC_SUBST(COMPPATH)
|
|
|
|
|
|
|
|
dnl The -no-testsuite modules omit the test subdir.
|
|
|
|
AM_CONDITIONAL(TESTSUBDIR, test -d $srcdir/testsuite)
|
|
|
|
|
|
|
|
dnl See whether the user prefers size or speed for Character.
|
|
|
|
dnl The default is size.
|
|
|
|
AC_ARG_ENABLE(fast-character,
|
[multiple changes]
Mon Aug 9 18:33:38 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* Makefile: Rebuilt.
* Makefile.am (toolexeclibdir): Add $(MULTISUBDIR) even for native
builds.
* java/net/natPlainSocketImpl.cc: Include <sys/select.h> only if
present.
* configure: Rebuilt.
* configure.in: Properly align --help output, fix capitalization
and punctuation.
* acinclude.m4: Likewise.
1999-08-09 Kresten Krab Thorup <krab@gnu.org>
* include/javaprims.h (_Jv_word, _Jv_word2): New types.
* include/java-interp.h (_Jv_InterpMethodInvocation): Use _Jv_word.
(_Jv_callInterpretedMethod): Unused. Remove.
(_Jv_InterpMethod::run,run_normal,run_synch_object,run_synch_class):
Use ffi_raw.
* include/java-cpool.h (_Jv_get, _Jv_put): Remove.
(_Jv_{store,load}{Indexes,Int,Float,Long,Double}): Use _Jv_word.
* boehm.cc (_Jv_MarkObj): Use _Jv_word.
* interpret.cc: use _Jv_word.
* defineclass.cc: use_Jv_word.
* resolve.cc: Use _Jv_word.
(_Jv_ResolvePoolEntry): Return _Jv_word.
* java/lang/Class.h (_Jv_Constants): Use _Jv_word for cpool.
* java/lang/natClassLoader.cc (_Jv_InternClassStrings): Use _Jv_word.
* interpret.cc (gnu::gcj::runtime::MethodInvocation::continue1):
Change comment.
From-SVN: r28641
1999-08-10 07:32:23 +02:00
|
|
|
[ --enable-fast-character prefer speed over size for Character],
|
1999-04-07 16:42:40 +02:00
|
|
|
# Nothing
|
|
|
|
, AC_DEFINE(COMPACT_CHARACTER))
|
|
|
|
|
1999-10-15 08:07:41 +02:00
|
|
|
dnl Should the runtime set system properties by examining the
|
|
|
|
dnl environment variable GCJ_PROPERTIES?
|
|
|
|
AC_ARG_ENABLE(getenv-properties,
|
|
|
|
[ --disable-getenv-properties
|
|
|
|
don't set system properties from GCJ_PROPERTIES])
|
|
|
|
|
|
|
|
dnl Whether GCJ_PROPERTIES is used depends on the target.
|
|
|
|
if test -n "$enable_getenv_properties"; then
|
|
|
|
enable_getenv_properties=${enable_getenv_properties_default-yes}
|
|
|
|
fi
|
|
|
|
if test "$enable_getenv_properties" = no; then
|
|
|
|
AC_DEFINE(DISABLE_GETENV_PROPERTIES)
|
|
|
|
fi
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
dnl See if the user has requested runtime debugging.
|
|
|
|
AC_ARG_ENABLE(libgcj-debug,
|
[multiple changes]
Mon Aug 9 18:33:38 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* Makefile: Rebuilt.
* Makefile.am (toolexeclibdir): Add $(MULTISUBDIR) even for native
builds.
* java/net/natPlainSocketImpl.cc: Include <sys/select.h> only if
present.
* configure: Rebuilt.
* configure.in: Properly align --help output, fix capitalization
and punctuation.
* acinclude.m4: Likewise.
1999-08-09 Kresten Krab Thorup <krab@gnu.org>
* include/javaprims.h (_Jv_word, _Jv_word2): New types.
* include/java-interp.h (_Jv_InterpMethodInvocation): Use _Jv_word.
(_Jv_callInterpretedMethod): Unused. Remove.
(_Jv_InterpMethod::run,run_normal,run_synch_object,run_synch_class):
Use ffi_raw.
* include/java-cpool.h (_Jv_get, _Jv_put): Remove.
(_Jv_{store,load}{Indexes,Int,Float,Long,Double}): Use _Jv_word.
* boehm.cc (_Jv_MarkObj): Use _Jv_word.
* interpret.cc: use _Jv_word.
* defineclass.cc: use_Jv_word.
* resolve.cc: Use _Jv_word.
(_Jv_ResolvePoolEntry): Return _Jv_word.
* java/lang/Class.h (_Jv_Constants): Use _Jv_word for cpool.
* java/lang/natClassLoader.cc (_Jv_InternClassStrings): Use _Jv_word.
* interpret.cc (gnu::gcj::runtime::MethodInvocation::continue1):
Change comment.
From-SVN: r28641
1999-08-10 07:32:23 +02:00
|
|
|
[ --enable-libgcj-debug enable runtime debugging code],
|
1999-04-07 16:42:40 +02:00
|
|
|
if test "$enable_libgcj_debug" = yes; then
|
|
|
|
AC_DEFINE(DEBUG)
|
|
|
|
fi)
|
|
|
|
|
1999-11-19 20:13:42 +01:00
|
|
|
dnl See if the user has the interpreter included.
|
[multiple changes]
1999-08-09 Anthony Green <green@cygnus.com>
* gij.cc: New file.
* include/config.h.in: Rebuilt.
* acconfig.h: Add INTERPRETER.
* configure: Rebuilt.
* Makefile.in: Rebuilt.
* Makefile.am (libffi_files): Identify the libffi object files for
inclusion in libgcj.
(LIBFFIINCS): Define.
* interpret.cc (gnu::gcj::runtime::MethodInvocation::continue1):
Dummy definition for configurations without an interpreter.
* java/net/natPlainSocketImpl.cc (getOption): Disamiguate call to
java::lang::Boolean constructor.
* include/java-interp.h: Always include java-cpool.h.
* java/lang/natClassLoader.cc (getVMClassLoader0): Always return 0
when INTERPRETER not defined.
* java/lang/Class.h (finalize): Define.
* gnu/gcj/util/path/DirectoryPathEntry.java (getURL): Catch
IOException from File.getCanonicalPath.
(getStream): Likewise.
* NEWS: More news.
* THANKS: More thanks.
1999-08-09 Kresten Krab Thorup <krab@gnu.org>
* resolve.cc (get_ffi_type_from_signature): Generate uint16 for
jchar type.
(_Jv_PrepareClass): Allow non-abstract classes to
have abstract subclasses.
(_Jv_ResolvePoolEntry): Revert subclass check for protected
fields and methods.
* interpret.cc (continue1/perform_invoke): Don't sign extend
uint16 return val.
(continue1/lshl,lshr): Push long, not int.
(continue1/ulshr): Use UINT64, not long long.
* defineclass.cc (handleFieldsEnd): Handle case when all fields
are static.
* java/lang/natClass.cc (forName): Add call to _Jv_InitClass.
* java/lang/FirstThread.java (run): Add top-level exception
handler.
(run0): Renamed from run.
1999-08-08 Kresten Krab Thorup <krab@gnu.org>
* configure.in (--with-interpreter): Added.
* include/config.h.in (INTERPRETER): Added.
* java/lang/ClassLoader.java: File replaced.
* java/lang/VMClassLoader.java: New file.
* java/lang/natClassLoader.cc: New file.
* gnu/gcj/runtime/MethodInvocation.java: New file.
* gnu/gcj/util/path/SearchPath.java: New file.
* gnu/gcj/util/path/PathEntry.java: New file.
* gnu/gcj/util/path/DirectoryPathEntry.java: New file.
* gnu/gcj/util/path/ZipPathEntry.java: New file.
* gnu/gcj/util/path/URLPathEntry.java: New file.
* gnu/gcj/util/path/CacheEntry.java: New file.
* include/java-interp.h: New file.
* include/java-cpool.h: New file.
* include/java-insns.h: New file.
* defineclass.cc: New file.
* interpret.cc: New file.
* resolve.cc: New file.
* java/lang/natClass.cc (loaded_classes, _Jv_RegisterClass,
_Jv_RegisterClasses, _Jv_FindClassInCache, _Jv_FindClass,
_Jv_NewClass, _Jv_FindArrayClass): Moved to natClassLoader.cc.
(finalize): New.
(STATE_NOTHING, STATE_RESOLVED, STATE_IN_PROGRESS, STATE_DONE,
STATE_ERROR): Moved to java/lang/Class.h and renamed with JV_
prefix.
(initializeClass): Use new JV_ prefixed names. Also, call
ClassLoader::resolveClass instead of _Jv_ResolveClass.
* java/lang/Class.h (JV_STATE_PRELOADING, JV_STATE_LOADING,
JV_STATE_LOADED, JV_STATE_COMPILED, JV_STATE_PREPARED,
JV_STATE_LINKED): New.
(_Jv_WaitForState, _Jv_RegisterInitiatingLoader,
_Jv_UnregisterClass, _Jv_InternClassStrings): New friends.
(_Jv_IsInterpretedClass, _Jv_InitField, _Jv_LookupDeclaredMethod,
_Jv_DetermineVTableIndex, _Jv_ResolvePoolEntry, _Jv_PrepareClass,
_Jv_ClassReader, _Jv_InterpClass, _Jv_InterpMethod,
_Jv_InterpMethodInvocation): New friends for interpreter.
(finalize): New.
(CONSTANT_Class, CONSTANT_String, etc.): Moved to
include/java-cpool.h and renamed with JV_ prefix.
* include/jvm.h (_Jv_makeUtf8Const, _Jv_makeUtf8TypeConst): New
decls.
(_Jv_UnregisterClass): New decl.
* java/lang/natClassLoader.cc (_Jv_FindArrayClass): Added
class loader argument.
(_Jv_FindClass): Use class loader.
* prims.cc (_Jv_makeUtf8Const): New function.
(_Jv_NewObjectArray): Change use of _Jv_FindArrayClass.
(_Jv_NewPrimArray): Ditto.
(_Jv_FindClassFromSignature): Ditto.
* java/lang/reflect/natArray.cc (newInstance): Ditto.
* java/lang/reflect/natMethod.cc (getType): Ditto.
* include/java-field.h (_Jv_Field::isRef): Make robust for
non-resolved contexts.
* boehm.cc (_Jv_MarkObj): Mark interpreter-related fields.
Also, don't mark class->next field.
* java/lang/VirtualMachineError.java: Added FIXME note.
* configure.in (INTERPSPEC): New spec.
* libgcj.spec.in: Added INTERPSPEC.
* Makefile.am: Added gcjh friends for java/lang/VMClassLoader and
gnu/gcj/runtime/MethodInvocation.
(libgcj_la_SOURCES): Added resolve.cc defineclass.cc interpret.cc.
(ordinary_java_source_files): Added above mentioned java classes.
* configure: Rebuilt.
* Makefile.in: Rebuilt.
From-SVN: r28597
1999-08-08 16:06:23 +02:00
|
|
|
AC_ARG_ENABLE(interpreter,
|
[multiple changes]
Mon Aug 9 18:33:38 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* Makefile: Rebuilt.
* Makefile.am (toolexeclibdir): Add $(MULTISUBDIR) even for native
builds.
* java/net/natPlainSocketImpl.cc: Include <sys/select.h> only if
present.
* configure: Rebuilt.
* configure.in: Properly align --help output, fix capitalization
and punctuation.
* acinclude.m4: Likewise.
1999-08-09 Kresten Krab Thorup <krab@gnu.org>
* include/javaprims.h (_Jv_word, _Jv_word2): New types.
* include/java-interp.h (_Jv_InterpMethodInvocation): Use _Jv_word.
(_Jv_callInterpretedMethod): Unused. Remove.
(_Jv_InterpMethod::run,run_normal,run_synch_object,run_synch_class):
Use ffi_raw.
* include/java-cpool.h (_Jv_get, _Jv_put): Remove.
(_Jv_{store,load}{Indexes,Int,Float,Long,Double}): Use _Jv_word.
* boehm.cc (_Jv_MarkObj): Use _Jv_word.
* interpret.cc: use _Jv_word.
* defineclass.cc: use_Jv_word.
* resolve.cc: Use _Jv_word.
(_Jv_ResolvePoolEntry): Return _Jv_word.
* java/lang/Class.h (_Jv_Constants): Use _Jv_word for cpool.
* java/lang/natClassLoader.cc (_Jv_InternClassStrings): Use _Jv_word.
* interpret.cc (gnu::gcj::runtime::MethodInvocation::continue1):
Change comment.
From-SVN: r28641
1999-08-10 07:32:23 +02:00
|
|
|
[ --enable-interpreter enable interpreter],
|
[multiple changes]
1999-08-09 Anthony Green <green@cygnus.com>
* gij.cc: New file.
* include/config.h.in: Rebuilt.
* acconfig.h: Add INTERPRETER.
* configure: Rebuilt.
* Makefile.in: Rebuilt.
* Makefile.am (libffi_files): Identify the libffi object files for
inclusion in libgcj.
(LIBFFIINCS): Define.
* interpret.cc (gnu::gcj::runtime::MethodInvocation::continue1):
Dummy definition for configurations without an interpreter.
* java/net/natPlainSocketImpl.cc (getOption): Disamiguate call to
java::lang::Boolean constructor.
* include/java-interp.h: Always include java-cpool.h.
* java/lang/natClassLoader.cc (getVMClassLoader0): Always return 0
when INTERPRETER not defined.
* java/lang/Class.h (finalize): Define.
* gnu/gcj/util/path/DirectoryPathEntry.java (getURL): Catch
IOException from File.getCanonicalPath.
(getStream): Likewise.
* NEWS: More news.
* THANKS: More thanks.
1999-08-09 Kresten Krab Thorup <krab@gnu.org>
* resolve.cc (get_ffi_type_from_signature): Generate uint16 for
jchar type.
(_Jv_PrepareClass): Allow non-abstract classes to
have abstract subclasses.
(_Jv_ResolvePoolEntry): Revert subclass check for protected
fields and methods.
* interpret.cc (continue1/perform_invoke): Don't sign extend
uint16 return val.
(continue1/lshl,lshr): Push long, not int.
(continue1/ulshr): Use UINT64, not long long.
* defineclass.cc (handleFieldsEnd): Handle case when all fields
are static.
* java/lang/natClass.cc (forName): Add call to _Jv_InitClass.
* java/lang/FirstThread.java (run): Add top-level exception
handler.
(run0): Renamed from run.
1999-08-08 Kresten Krab Thorup <krab@gnu.org>
* configure.in (--with-interpreter): Added.
* include/config.h.in (INTERPRETER): Added.
* java/lang/ClassLoader.java: File replaced.
* java/lang/VMClassLoader.java: New file.
* java/lang/natClassLoader.cc: New file.
* gnu/gcj/runtime/MethodInvocation.java: New file.
* gnu/gcj/util/path/SearchPath.java: New file.
* gnu/gcj/util/path/PathEntry.java: New file.
* gnu/gcj/util/path/DirectoryPathEntry.java: New file.
* gnu/gcj/util/path/ZipPathEntry.java: New file.
* gnu/gcj/util/path/URLPathEntry.java: New file.
* gnu/gcj/util/path/CacheEntry.java: New file.
* include/java-interp.h: New file.
* include/java-cpool.h: New file.
* include/java-insns.h: New file.
* defineclass.cc: New file.
* interpret.cc: New file.
* resolve.cc: New file.
* java/lang/natClass.cc (loaded_classes, _Jv_RegisterClass,
_Jv_RegisterClasses, _Jv_FindClassInCache, _Jv_FindClass,
_Jv_NewClass, _Jv_FindArrayClass): Moved to natClassLoader.cc.
(finalize): New.
(STATE_NOTHING, STATE_RESOLVED, STATE_IN_PROGRESS, STATE_DONE,
STATE_ERROR): Moved to java/lang/Class.h and renamed with JV_
prefix.
(initializeClass): Use new JV_ prefixed names. Also, call
ClassLoader::resolveClass instead of _Jv_ResolveClass.
* java/lang/Class.h (JV_STATE_PRELOADING, JV_STATE_LOADING,
JV_STATE_LOADED, JV_STATE_COMPILED, JV_STATE_PREPARED,
JV_STATE_LINKED): New.
(_Jv_WaitForState, _Jv_RegisterInitiatingLoader,
_Jv_UnregisterClass, _Jv_InternClassStrings): New friends.
(_Jv_IsInterpretedClass, _Jv_InitField, _Jv_LookupDeclaredMethod,
_Jv_DetermineVTableIndex, _Jv_ResolvePoolEntry, _Jv_PrepareClass,
_Jv_ClassReader, _Jv_InterpClass, _Jv_InterpMethod,
_Jv_InterpMethodInvocation): New friends for interpreter.
(finalize): New.
(CONSTANT_Class, CONSTANT_String, etc.): Moved to
include/java-cpool.h and renamed with JV_ prefix.
* include/jvm.h (_Jv_makeUtf8Const, _Jv_makeUtf8TypeConst): New
decls.
(_Jv_UnregisterClass): New decl.
* java/lang/natClassLoader.cc (_Jv_FindArrayClass): Added
class loader argument.
(_Jv_FindClass): Use class loader.
* prims.cc (_Jv_makeUtf8Const): New function.
(_Jv_NewObjectArray): Change use of _Jv_FindArrayClass.
(_Jv_NewPrimArray): Ditto.
(_Jv_FindClassFromSignature): Ditto.
* java/lang/reflect/natArray.cc (newInstance): Ditto.
* java/lang/reflect/natMethod.cc (getType): Ditto.
* include/java-field.h (_Jv_Field::isRef): Make robust for
non-resolved contexts.
* boehm.cc (_Jv_MarkObj): Mark interpreter-related fields.
Also, don't mark class->next field.
* java/lang/VirtualMachineError.java: Added FIXME note.
* configure.in (INTERPSPEC): New spec.
* libgcj.spec.in: Added INTERPSPEC.
* Makefile.am: Added gcjh friends for java/lang/VMClassLoader and
gnu/gcj/runtime/MethodInvocation.
(libgcj_la_SOURCES): Added resolve.cc defineclass.cc interpret.cc.
(ordinary_java_source_files): Added above mentioned java classes.
* configure: Rebuilt.
* Makefile.in: Rebuilt.
From-SVN: r28597
1999-08-08 16:06:23 +02:00
|
|
|
if test "$enable_interpreter" = yes; then
|
2000-01-09 23:25:54 +01:00
|
|
|
# This can also be set in configure.host.
|
|
|
|
libgcj_interpreter=yes
|
2000-01-19 06:06:03 +01:00
|
|
|
elif test "$enable_interpreter" = no; then
|
|
|
|
libgcj_interpreter=no
|
[multiple changes]
1999-08-09 Anthony Green <green@cygnus.com>
* gij.cc: New file.
* include/config.h.in: Rebuilt.
* acconfig.h: Add INTERPRETER.
* configure: Rebuilt.
* Makefile.in: Rebuilt.
* Makefile.am (libffi_files): Identify the libffi object files for
inclusion in libgcj.
(LIBFFIINCS): Define.
* interpret.cc (gnu::gcj::runtime::MethodInvocation::continue1):
Dummy definition for configurations without an interpreter.
* java/net/natPlainSocketImpl.cc (getOption): Disamiguate call to
java::lang::Boolean constructor.
* include/java-interp.h: Always include java-cpool.h.
* java/lang/natClassLoader.cc (getVMClassLoader0): Always return 0
when INTERPRETER not defined.
* java/lang/Class.h (finalize): Define.
* gnu/gcj/util/path/DirectoryPathEntry.java (getURL): Catch
IOException from File.getCanonicalPath.
(getStream): Likewise.
* NEWS: More news.
* THANKS: More thanks.
1999-08-09 Kresten Krab Thorup <krab@gnu.org>
* resolve.cc (get_ffi_type_from_signature): Generate uint16 for
jchar type.
(_Jv_PrepareClass): Allow non-abstract classes to
have abstract subclasses.
(_Jv_ResolvePoolEntry): Revert subclass check for protected
fields and methods.
* interpret.cc (continue1/perform_invoke): Don't sign extend
uint16 return val.
(continue1/lshl,lshr): Push long, not int.
(continue1/ulshr): Use UINT64, not long long.
* defineclass.cc (handleFieldsEnd): Handle case when all fields
are static.
* java/lang/natClass.cc (forName): Add call to _Jv_InitClass.
* java/lang/FirstThread.java (run): Add top-level exception
handler.
(run0): Renamed from run.
1999-08-08 Kresten Krab Thorup <krab@gnu.org>
* configure.in (--with-interpreter): Added.
* include/config.h.in (INTERPRETER): Added.
* java/lang/ClassLoader.java: File replaced.
* java/lang/VMClassLoader.java: New file.
* java/lang/natClassLoader.cc: New file.
* gnu/gcj/runtime/MethodInvocation.java: New file.
* gnu/gcj/util/path/SearchPath.java: New file.
* gnu/gcj/util/path/PathEntry.java: New file.
* gnu/gcj/util/path/DirectoryPathEntry.java: New file.
* gnu/gcj/util/path/ZipPathEntry.java: New file.
* gnu/gcj/util/path/URLPathEntry.java: New file.
* gnu/gcj/util/path/CacheEntry.java: New file.
* include/java-interp.h: New file.
* include/java-cpool.h: New file.
* include/java-insns.h: New file.
* defineclass.cc: New file.
* interpret.cc: New file.
* resolve.cc: New file.
* java/lang/natClass.cc (loaded_classes, _Jv_RegisterClass,
_Jv_RegisterClasses, _Jv_FindClassInCache, _Jv_FindClass,
_Jv_NewClass, _Jv_FindArrayClass): Moved to natClassLoader.cc.
(finalize): New.
(STATE_NOTHING, STATE_RESOLVED, STATE_IN_PROGRESS, STATE_DONE,
STATE_ERROR): Moved to java/lang/Class.h and renamed with JV_
prefix.
(initializeClass): Use new JV_ prefixed names. Also, call
ClassLoader::resolveClass instead of _Jv_ResolveClass.
* java/lang/Class.h (JV_STATE_PRELOADING, JV_STATE_LOADING,
JV_STATE_LOADED, JV_STATE_COMPILED, JV_STATE_PREPARED,
JV_STATE_LINKED): New.
(_Jv_WaitForState, _Jv_RegisterInitiatingLoader,
_Jv_UnregisterClass, _Jv_InternClassStrings): New friends.
(_Jv_IsInterpretedClass, _Jv_InitField, _Jv_LookupDeclaredMethod,
_Jv_DetermineVTableIndex, _Jv_ResolvePoolEntry, _Jv_PrepareClass,
_Jv_ClassReader, _Jv_InterpClass, _Jv_InterpMethod,
_Jv_InterpMethodInvocation): New friends for interpreter.
(finalize): New.
(CONSTANT_Class, CONSTANT_String, etc.): Moved to
include/java-cpool.h and renamed with JV_ prefix.
* include/jvm.h (_Jv_makeUtf8Const, _Jv_makeUtf8TypeConst): New
decls.
(_Jv_UnregisterClass): New decl.
* java/lang/natClassLoader.cc (_Jv_FindArrayClass): Added
class loader argument.
(_Jv_FindClass): Use class loader.
* prims.cc (_Jv_makeUtf8Const): New function.
(_Jv_NewObjectArray): Change use of _Jv_FindArrayClass.
(_Jv_NewPrimArray): Ditto.
(_Jv_FindClassFromSignature): Ditto.
* java/lang/reflect/natArray.cc (newInstance): Ditto.
* java/lang/reflect/natMethod.cc (getType): Ditto.
* include/java-field.h (_Jv_Field::isRef): Make robust for
non-resolved contexts.
* boehm.cc (_Jv_MarkObj): Mark interpreter-related fields.
Also, don't mark class->next field.
* java/lang/VirtualMachineError.java: Added FIXME note.
* configure.in (INTERPSPEC): New spec.
* libgcj.spec.in: Added INTERPSPEC.
* Makefile.am: Added gcjh friends for java/lang/VMClassLoader and
gnu/gcj/runtime/MethodInvocation.
(libgcj_la_SOURCES): Added resolve.cc defineclass.cc interpret.cc.
(ordinary_java_source_files): Added above mentioned java classes.
* configure: Rebuilt.
* Makefile.in: Rebuilt.
From-SVN: r28597
1999-08-08 16:06:23 +02:00
|
|
|
fi)
|
|
|
|
|
2000-01-09 23:25:54 +01:00
|
|
|
if test "$libgcj_interpreter" = yes; then
|
|
|
|
AC_DEFINE(INTERPRETER)
|
|
|
|
fi
|
|
|
|
|
1999-11-19 20:13:42 +01:00
|
|
|
EXCEPTIONSPEC=
|
|
|
|
dnl See if we should use setjmp/longjmp exceptions
|
|
|
|
AC_ARG_ENABLE(sjlj-exceptions,
|
|
|
|
[ --enable-sjlj-exceptions use setjmp/longjmp exceptions],
|
|
|
|
if test "$enable_sjlj_exceptions" = yes; then
|
|
|
|
# This can be set in configure.host.
|
|
|
|
libgcj_sjlj=yes
|
|
|
|
fi)
|
|
|
|
|
|
|
|
if test "$libgcj_sjlj" = yes; then
|
|
|
|
EXCEPTIONSPEC="-fsjlj-exceptions"
|
|
|
|
AC_DEFINE(SJLJ_EXCEPTIONS)
|
|
|
|
fi
|
|
|
|
|
1999-12-20 03:18:11 +01:00
|
|
|
FORCELIBGCCSPEC=
|
|
|
|
dnl Work around libgcc design flaw.
|
|
|
|
if test "$ac_cv_prog_gnu_ld" = yes; then
|
2000-01-17 16:45:24 +01:00
|
|
|
FORCELIBGCCSPEC="-u __rethrow -u __frame_state_for -lgcc"
|
1999-12-20 03:18:11 +01:00
|
|
|
fi
|
|
|
|
|
|
|
|
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)],
|
2000-09-13 21:01:20 +02:00
|
|
|
[LIBDATASTARTSPEC="-u data_start libgcjdata.a%s"
|
1999-12-20 03:18:11 +01:00
|
|
|
NEEDS_DATA_START=yes
|
|
|
|
AC_MSG_RESULT(missing)])
|
|
|
|
AC_SUBST(LIBDATASTARTSPEC)
|
|
|
|
|
1999-10-02 02:19:01 +02:00
|
|
|
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,
|
|
|
|
[ --disable-java-net disable java.net])
|
|
|
|
|
|
|
|
dnl Whether java.net is built by default can depend on the target.
|
|
|
|
if test -n "$enable_java_net"; then
|
|
|
|
enable_java_net=${enable_java_net_default-yes}
|
|
|
|
fi
|
1999-10-13 02:00:35 +02:00
|
|
|
if test "$enable_java_net" = no; then
|
1999-10-02 02:19:01 +02:00
|
|
|
AC_DEFINE(DISABLE_JAVA_NET)
|
|
|
|
fi
|
|
|
|
|
2000-04-02 17:34:17 +02:00
|
|
|
dnl See if the user wants to disable JVMPI support.
|
|
|
|
AC_ARG_ENABLE(jvmpi,
|
|
|
|
[ --disable-jvmpi disable JVMPI support])
|
|
|
|
|
|
|
|
if test "$enable_jvmpi" != no; then
|
|
|
|
AC_DEFINE(ENABLE_JVMPI)
|
|
|
|
fi
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
dnl If the target is an eCos system, use the appropriate eCos
|
|
|
|
dnl I/O routines.
|
|
|
|
dnl FIXME: this should not be a local option but a global target
|
|
|
|
dnl system; at present there is no eCos target.
|
|
|
|
TARGET_ECOS="no"
|
|
|
|
AC_ARG_WITH(ecos,
|
[multiple changes]
Mon Aug 9 18:33:38 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* Makefile: Rebuilt.
* Makefile.am (toolexeclibdir): Add $(MULTISUBDIR) even for native
builds.
* java/net/natPlainSocketImpl.cc: Include <sys/select.h> only if
present.
* configure: Rebuilt.
* configure.in: Properly align --help output, fix capitalization
and punctuation.
* acinclude.m4: Likewise.
1999-08-09 Kresten Krab Thorup <krab@gnu.org>
* include/javaprims.h (_Jv_word, _Jv_word2): New types.
* include/java-interp.h (_Jv_InterpMethodInvocation): Use _Jv_word.
(_Jv_callInterpretedMethod): Unused. Remove.
(_Jv_InterpMethod::run,run_normal,run_synch_object,run_synch_class):
Use ffi_raw.
* include/java-cpool.h (_Jv_get, _Jv_put): Remove.
(_Jv_{store,load}{Indexes,Int,Float,Long,Double}): Use _Jv_word.
* boehm.cc (_Jv_MarkObj): Use _Jv_word.
* interpret.cc: use _Jv_word.
* defineclass.cc: use_Jv_word.
* resolve.cc: Use _Jv_word.
(_Jv_ResolvePoolEntry): Return _Jv_word.
* java/lang/Class.h (_Jv_Constants): Use _Jv_word for cpool.
* java/lang/natClassLoader.cc (_Jv_InternClassStrings): Use _Jv_word.
* interpret.cc (gnu::gcj::runtime::MethodInvocation::continue1):
Change comment.
From-SVN: r28641
1999-08-10 07:32:23 +02:00
|
|
|
[ --with-ecos enable runtime eCos target support],
|
1999-04-07 16:42:40 +02:00
|
|
|
TARGET_ECOS="$with_ecos"
|
|
|
|
)
|
|
|
|
|
|
|
|
case "$TARGET_ECOS" in
|
|
|
|
no)
|
|
|
|
FILE_DESCRIPTOR=natFileDescriptorPosix.cc
|
1999-09-29 00:16:57 +02:00
|
|
|
PROCESS=${PROCESS-Posix}
|
1999-04-07 16:42:40 +02:00
|
|
|
;;
|
|
|
|
*)
|
|
|
|
FILE_DESCRIPTOR=natFileDescriptorEcos.cc
|
1999-05-12 13:23:44 +02:00
|
|
|
PROCESS=Ecos
|
1999-04-07 16:42:40 +02:00
|
|
|
AC_DEFINE(ECOS)
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
[multiple changes]
Fri May 28 22:20:03 1999 Anthony Green <green@cygnus.com>
* java/lang/fdlibm.h: Don't use __uint32_t. Include mprec.h.
* java/lang/e_log.c: Don't use __uint32_t.
1999-05-27 Eric Christopher <echristo@cygnus.com>
* configure: Rebuilt
* configure.in: Fixed ISO C9X and namespace collision with __uint32_t
* acconfig.h: Rebuilt
* include/config.h.in: Rebuilt
* java/lang/mprec.h, java/lang/e_acos.c, java/lang/e_asin.c,
java/lang/e_atan2.c, java/lang/e_exp.c, java/lang/e_fmod.c,
e_log.c, java/lang/e_pow.c, java/lang/e_rem_pio2.c,
java/lang/e_remainder.c, java/lang/e_sqrt.c, java/lang/fdlibm.h,
k_tan.c, java/lang/mprec.h, java/lang/s_atan.c,
java/lang/s_ceil.c, java/lang/s_copysign.c, java/lang/s_fabs.c,
s_floor.c, java/lang/s_rint.c, java/lang/sf_rint.c: Fixed ISO C9X
and namespace collision with __uint32_t
From-SVN: r27729
1999-06-24 22:06:09 +02:00
|
|
|
AC_EGREP_HEADER(uint32_t, stdint.h, AC_DEFINE(HAVE_INT32_DEFINED))
|
|
|
|
AC_EGREP_HEADER(uint32_t, inttypes.h, AC_DEFINE(HAVE_INT32_DEFINED))
|
|
|
|
AC_EGREP_HEADER(u_int32_t, sys/types.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED))
|
|
|
|
AC_EGREP_HEADER(u_int32_t, sys/config.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED))
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
dnl These may not be defined in a non-ANS conformant embedded system.
|
|
|
|
dnl FIXME: Should these case a runtime exception in that case?
|
|
|
|
AC_EGREP_HEADER(mktime, time.h, AC_DEFINE(HAVE_MKTIME))
|
|
|
|
AC_EGREP_HEADER(localtime, time.h, AC_DEFINE(HAVE_LOCALTIME))
|
|
|
|
|
|
|
|
dnl Create the subdirectory for natFileDescriptor.cc, or the attempt
|
|
|
|
dnl to create the link will fail.
|
|
|
|
test -d java || mkdir java
|
|
|
|
test -d java/io || mkdir java/io
|
|
|
|
AC_LINK_FILES(java/io/$FILE_DESCRIPTOR, java/io/natFileDescriptor.cc)
|
|
|
|
|
1999-05-12 13:23:44 +02:00
|
|
|
dnl Likewise for ConcreteProcess.java and natConcreteProcess.cc.
|
|
|
|
test -d java/lang || mkdir java/lang
|
|
|
|
AC_LINK_FILES(java/lang/${PROCESS}Process.java, java/lang/ConcreteProcess.java)
|
|
|
|
AC_LINK_FILES(java/lang/nat${PROCESS}Process.cc, java/lang/natConcreteProcess.cc)
|
|
|
|
|
1999-05-11 14:11:09 +02:00
|
|
|
SYSTEMSPEC=
|
|
|
|
AC_SUBST(SYSTEMSPEC)
|
|
|
|
|
2000-03-04 22:50:19 +01:00
|
|
|
LIBGCJTESTSPEC="-L`pwd`/.libs -rpath `pwd`/.libs"
|
|
|
|
AC_SUBST(LIBGCJTESTSPEC)
|
|
|
|
|
1999-05-11 14:11:09 +02:00
|
|
|
AC_ARG_WITH(system-zlib,
|
[multiple changes]
Mon Aug 9 18:33:38 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* Makefile: Rebuilt.
* Makefile.am (toolexeclibdir): Add $(MULTISUBDIR) even for native
builds.
* java/net/natPlainSocketImpl.cc: Include <sys/select.h> only if
present.
* configure: Rebuilt.
* configure.in: Properly align --help output, fix capitalization
and punctuation.
* acinclude.m4: Likewise.
1999-08-09 Kresten Krab Thorup <krab@gnu.org>
* include/javaprims.h (_Jv_word, _Jv_word2): New types.
* include/java-interp.h (_Jv_InterpMethodInvocation): Use _Jv_word.
(_Jv_callInterpretedMethod): Unused. Remove.
(_Jv_InterpMethod::run,run_normal,run_synch_object,run_synch_class):
Use ffi_raw.
* include/java-cpool.h (_Jv_get, _Jv_put): Remove.
(_Jv_{store,load}{Indexes,Int,Float,Long,Double}): Use _Jv_word.
* boehm.cc (_Jv_MarkObj): Use _Jv_word.
* interpret.cc: use _Jv_word.
* defineclass.cc: use_Jv_word.
* resolve.cc: Use _Jv_word.
(_Jv_ResolvePoolEntry): Return _Jv_word.
* java/lang/Class.h (_Jv_Constants): Use _Jv_word for cpool.
* java/lang/natClassLoader.cc (_Jv_InternClassStrings): Use _Jv_word.
* interpret.cc (gnu::gcj::runtime::MethodInvocation::continue1):
Change comment.
From-SVN: r28641
1999-08-10 07:32:23 +02:00
|
|
|
[ --with-system-zlib use installed libz])
|
1999-05-11 14:11:09 +02:00
|
|
|
ZLIBSPEC=
|
|
|
|
AC_SUBST(ZLIBSPEC)
|
2000-03-04 22:50:19 +01:00
|
|
|
ZLIBTESTSPEC=
|
|
|
|
AC_SUBST(ZLIBTESTSPEC)
|
1999-05-11 14:11:09 +02:00
|
|
|
|
|
|
|
dnl FIXME: this should be _libs on some hosts.
|
|
|
|
libsubdir=.libs
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
dnl Allow the GC to be disabled. Can be useful when debugging.
|
|
|
|
AC_MSG_CHECKING([for garbage collector to use])
|
|
|
|
AC_ARG_ENABLE(java-gc,
|
|
|
|
changequote(<<,>>)dnl
|
[multiple changes]
Mon Aug 9 18:33:38 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* Makefile: Rebuilt.
* Makefile.am (toolexeclibdir): Add $(MULTISUBDIR) even for native
builds.
* java/net/natPlainSocketImpl.cc: Include <sys/select.h> only if
present.
* configure: Rebuilt.
* configure.in: Properly align --help output, fix capitalization
and punctuation.
* acinclude.m4: Likewise.
1999-08-09 Kresten Krab Thorup <krab@gnu.org>
* include/javaprims.h (_Jv_word, _Jv_word2): New types.
* include/java-interp.h (_Jv_InterpMethodInvocation): Use _Jv_word.
(_Jv_callInterpretedMethod): Unused. Remove.
(_Jv_InterpMethod::run,run_normal,run_synch_object,run_synch_class):
Use ffi_raw.
* include/java-cpool.h (_Jv_get, _Jv_put): Remove.
(_Jv_{store,load}{Indexes,Int,Float,Long,Double}): Use _Jv_word.
* boehm.cc (_Jv_MarkObj): Use _Jv_word.
* interpret.cc: use _Jv_word.
* defineclass.cc: use_Jv_word.
* resolve.cc: Use _Jv_word.
(_Jv_ResolvePoolEntry): Return _Jv_word.
* java/lang/Class.h (_Jv_Constants): Use _Jv_word for cpool.
* java/lang/natClassLoader.cc (_Jv_InternClassStrings): Use _Jv_word.
* interpret.cc (gnu::gcj::runtime::MethodInvocation::continue1):
Change comment.
From-SVN: r28641
1999-08-10 07:32:23 +02:00
|
|
|
<< --enable-java-gc=TYPE choose garbage collector [boehm]>>,
|
1999-04-07 16:42:40 +02:00
|
|
|
changequote([,])
|
|
|
|
GC=$enableval,
|
|
|
|
GC=boehm)
|
|
|
|
GCLIBS=
|
|
|
|
GCINCS=
|
|
|
|
GCDEPS=
|
|
|
|
GCOBJS=
|
1999-05-11 14:11:09 +02:00
|
|
|
GCSPEC=
|
2000-09-30 11:56:58 +02:00
|
|
|
JC1GCSPEC=
|
2000-03-04 22:50:19 +01:00
|
|
|
GCTESTSPEC=
|
1999-04-07 16:42:40 +02:00
|
|
|
case "$GC" in
|
|
|
|
boehm)
|
|
|
|
AC_MSG_RESULT(boehm)
|
1999-04-26 16:50:15 +02:00
|
|
|
GCDEPS='$(top_builddir)/../boehm-gc/libgcjgc.la'
|
1999-05-11 14:11:09 +02:00
|
|
|
# We include the path to the boehm-gc build directory.
|
|
|
|
# See Makefile.am to understand why.
|
|
|
|
GCLIBS="$GCDEPS -L\$(here)/../boehm-gc/$libsubdir"
|
1999-04-07 16:42:40 +02:00
|
|
|
GCINCS='-I$(top_srcdir)/../boehm-gc -I$(top_builddir)/../boehm-gc'
|
1999-05-11 14:11:09 +02:00
|
|
|
GCSPEC='-lgcjgc'
|
2000-09-30 11:56:58 +02:00
|
|
|
JC1GCSPEC='-fuse-boehm-gc'
|
2000-03-04 22:50:19 +01:00
|
|
|
GCTESTSPEC="-L`pwd`/../boehm-gc/.libs -rpath `pwd`/../boehm-gc/.libs"
|
1999-04-07 16:42:40 +02:00
|
|
|
dnl We also want to pick up some cpp flags required when including
|
|
|
|
dnl boehm-config.h. Yuck.
|
|
|
|
GCINCS="$GCINCS `cat ../boehm-gc/boehm-cflags`"
|
1999-04-26 16:50:15 +02:00
|
|
|
GCOBJS=boehm.lo
|
1999-04-07 16:42:40 +02:00
|
|
|
GCHDR=boehm-gc.h
|
|
|
|
dnl The POSIX thread support needs to know this.
|
|
|
|
AC_DEFINE(HAVE_BOEHM_GC)
|
|
|
|
;;
|
|
|
|
no)
|
|
|
|
AC_MSG_RESULT(none)
|
1999-04-26 16:50:15 +02:00
|
|
|
GCOBJS=nogc.lo
|
1999-04-07 16:42:40 +02:00
|
|
|
GCHDR=no-gc.h
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
AC_MSG_ERROR(unrecognized collector \"$GC\")
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
AC_SUBST(GCLIBS)
|
|
|
|
AC_SUBST(GCINCS)
|
|
|
|
AC_SUBST(GCDEPS)
|
|
|
|
AC_SUBST(GCOBJS)
|
1999-05-11 14:11:09 +02:00
|
|
|
AC_SUBST(GCSPEC)
|
2000-09-30 11:56:58 +02:00
|
|
|
AC_SUBST(JC1GCSPEC)
|
2000-03-04 22:50:19 +01:00
|
|
|
AC_SUBST(GCTESTSPEC)
|
1999-04-07 16:42:40 +02:00
|
|
|
AC_LINK_FILES(include/$GCHDR, include/java-gc.h)
|
|
|
|
|
|
|
|
|
|
|
|
dnl Note that this code is kept in sync with similar code in gcc/configure.in.
|
|
|
|
dnl In particular both packages must make the same decision about which
|
|
|
|
dnl thread package to use.
|
|
|
|
AC_MSG_CHECKING([for threads package to use])
|
[multiple changes]
Mon Aug 9 18:33:38 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* Makefile: Rebuilt.
* Makefile.am (toolexeclibdir): Add $(MULTISUBDIR) even for native
builds.
* java/net/natPlainSocketImpl.cc: Include <sys/select.h> only if
present.
* configure: Rebuilt.
* configure.in: Properly align --help output, fix capitalization
and punctuation.
* acinclude.m4: Likewise.
1999-08-09 Kresten Krab Thorup <krab@gnu.org>
* include/javaprims.h (_Jv_word, _Jv_word2): New types.
* include/java-interp.h (_Jv_InterpMethodInvocation): Use _Jv_word.
(_Jv_callInterpretedMethod): Unused. Remove.
(_Jv_InterpMethod::run,run_normal,run_synch_object,run_synch_class):
Use ffi_raw.
* include/java-cpool.h (_Jv_get, _Jv_put): Remove.
(_Jv_{store,load}{Indexes,Int,Float,Long,Double}): Use _Jv_word.
* boehm.cc (_Jv_MarkObj): Use _Jv_word.
* interpret.cc: use _Jv_word.
* defineclass.cc: use_Jv_word.
* resolve.cc: Use _Jv_word.
(_Jv_ResolvePoolEntry): Return _Jv_word.
* java/lang/Class.h (_Jv_Constants): Use _Jv_word for cpool.
* java/lang/natClassLoader.cc (_Jv_InternClassStrings): Use _Jv_word.
* interpret.cc (gnu::gcj::runtime::MethodInvocation::continue1):
Change comment.
From-SVN: r28641
1999-08-10 07:32:23 +02:00
|
|
|
AC_ARG_ENABLE(threads, [ --enable-threads=TYPE choose threading package],
|
1999-04-07 16:42:40 +02:00
|
|
|
THREADS=$enableval,
|
|
|
|
dnl FIXME: figure out native threads to use here.
|
|
|
|
THREADS=no)
|
|
|
|
|
|
|
|
if test "$THREADS" = yes; then
|
|
|
|
case "$host" in
|
|
|
|
*-*-vxworks*)
|
|
|
|
THREADS=vxworks
|
|
|
|
;;
|
|
|
|
*-*-linux*)
|
|
|
|
# FIXME: this isn't correct in all cases.
|
|
|
|
THREADS=posix
|
|
|
|
;;
|
|
|
|
*-*-win*)
|
|
|
|
THREADS=win32
|
|
|
|
;;
|
|
|
|
*-*-irix*)
|
1999-05-05 13:52:03 +02:00
|
|
|
# FIXME: for now, choose POSIX, because we implement that.
|
|
|
|
# Later, choose irix threads.
|
|
|
|
THREADS=posix
|
1999-04-07 16:42:40 +02:00
|
|
|
;;
|
|
|
|
*-*-solaris*)
|
|
|
|
# FIXME: for now, choose POSIX, because we implement that.
|
|
|
|
# Later, choose solaris threads.
|
|
|
|
THREADS=posix
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
# For now.
|
|
|
|
THREADS=none
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
|
|
|
|
case "$THREADS" in
|
|
|
|
no | none | single)
|
|
|
|
THREADS=none
|
|
|
|
;;
|
|
|
|
posix | pthreads)
|
|
|
|
THREADS=posix
|
|
|
|
case "$host" in
|
|
|
|
*-*-linux*)
|
|
|
|
AC_DEFINE(LINUX_THREADS)
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
decosf1 | irix | mach | os2 | solaris | win32 | dce | vxworks)
|
|
|
|
AC_MSG_ERROR(thread package $THREADS not yet supported)
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
AC_MSG_ERROR($THREADS is an unknown thread package)
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
AC_MSG_RESULT($THREADS)
|
|
|
|
|
|
|
|
THREADLIBS=
|
|
|
|
THREADINCS=
|
|
|
|
THREADDEPS=
|
|
|
|
THREADOBJS=
|
|
|
|
THREADH=
|
1999-05-11 14:11:09 +02:00
|
|
|
THREADSPEC=
|
1999-04-07 16:42:40 +02:00
|
|
|
case "$THREADS" in
|
|
|
|
posix)
|
|
|
|
THREADLIBS=-lpthread
|
1999-05-11 14:11:09 +02:00
|
|
|
THREADSPEC=-lpthread
|
1999-04-26 16:50:15 +02:00
|
|
|
THREADOBJS=posix-threads.lo
|
1999-04-07 16:42:40 +02:00
|
|
|
THREADH=posix-threads.h
|
|
|
|
# MIT pthreads doesn't seem to have the mutexattr functions.
|
|
|
|
# But for now we don't check for it. We just assume you aren't
|
|
|
|
# using MIT pthreads.
|
|
|
|
AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_INIT)
|
2000-04-21 22:46:11 +02:00
|
|
|
|
|
|
|
# If we're using the Boehm GC, then we happen to know that it
|
|
|
|
# defines _REENTRANT, so we don't bother. Eww.
|
|
|
|
if test "$GC" != boehm; then
|
|
|
|
AC_DEFINE(_REENTRANT, 1, [Required define if using POSIX threads])
|
|
|
|
fi
|
|
|
|
AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [Required define if using POSIX threads])
|
1999-04-07 16:42:40 +02:00
|
|
|
;;
|
|
|
|
|
|
|
|
none)
|
1999-04-26 16:50:15 +02:00
|
|
|
THREADOBJS=no-threads.lo
|
1999-04-07 16:42:40 +02:00
|
|
|
THREADH=no-threads.h
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
AC_LINK_FILES(include/$THREADH, include/java-threads.h)
|
|
|
|
AC_SUBST(THREADLIBS)
|
|
|
|
AC_SUBST(THREADINCS)
|
|
|
|
AC_SUBST(THREADDEPS)
|
|
|
|
AC_SUBST(THREADOBJS)
|
1999-05-11 14:11:09 +02:00
|
|
|
AC_SUBST(THREADSPEC)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
AM_CONDITIONAL(USING_GCC, test "$GCC" = yes)
|
|
|
|
|
|
|
|
CANADIAN=no
|
|
|
|
NULL_TARGET=no
|
1999-10-07 01:13:37 +02:00
|
|
|
NATIVE=yes
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
# Find eh-common.h and support headers. If we're in the tree with
|
|
|
|
# gcc, then look there. Otherwise look in compat-include. If all else
|
|
|
|
# fails, just hope the user has set things up somehow.
|
|
|
|
if test -r $srcdir/../gcc/eh-common.h; then
|
|
|
|
EH_COMMON_INCLUDE='-I$(top_srcdir)/../gcc -I$(top_srcdir)/../include'
|
|
|
|
else
|
|
|
|
if test -d $srcdir/../compat-include; then
|
|
|
|
EH_COMMON_INCLUDE='-I$(top_srcdir)/../compat-include'
|
|
|
|
else
|
|
|
|
EH_COMMON_INCLUDE=
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -n "${with_cross_host}"; then
|
|
|
|
# We are being configured with a cross compiler. AC_REPLACE_FUNCS
|
|
|
|
# may not work correctly, because the compiler may not be able to
|
|
|
|
# link executables.
|
|
|
|
|
|
|
|
# We assume newlib. This lets us hard-code the functions we know
|
|
|
|
# we'll have.
|
|
|
|
AC_DEFINE(HAVE_MEMMOVE)
|
|
|
|
AC_DEFINE(HAVE_MEMCPY)
|
|
|
|
AC_DEFINE(HAVE_STRERROR)
|
|
|
|
AC_DEFINE(HAVE_GMTIME_R)
|
|
|
|
AC_DEFINE(HAVE_LOCALTIME_R)
|
|
|
|
dnl This is only for POSIX threads.
|
|
|
|
AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_INIT)
|
|
|
|
dnl We also assume we are using gcc, which provides alloca.
|
|
|
|
AC_DEFINE(HAVE_ALLOCA)
|
|
|
|
|
1999-12-15 23:38:56 +01:00
|
|
|
dnl Assume we do not have getuid and friends.
|
|
|
|
AC_DEFINE(NO_GETUID)
|
|
|
|
|
1999-10-02 17:44:24 +02:00
|
|
|
ZLIBSPEC=-lzgcj
|
2000-03-04 22:50:19 +01:00
|
|
|
ZLIBTESTSPEC="-L`pwd`/../zlib/.libs -rpath `pwd`/../zlib/.libs"
|
1999-05-11 14:11:09 +02:00
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
# If Canadian cross, then don't pick up tools from the build
|
|
|
|
# directory.
|
|
|
|
if test "$build" != "$with_cross_host"; then
|
|
|
|
CANADIAN=yes
|
|
|
|
EH_COMMON_INCLUDE=
|
1999-10-07 01:13:37 +02:00
|
|
|
GCJ="${target_alias}-gcj"
|
1999-05-07 20:44:38 +02:00
|
|
|
else
|
|
|
|
GCJ=
|
1999-04-07 16:42:40 +02:00
|
|
|
fi
|
1999-10-07 01:13:37 +02:00
|
|
|
NATIVE=no
|
1999-04-07 16:42:40 +02:00
|
|
|
else
|
1999-09-03 09:42:40 +02:00
|
|
|
AC_CHECK_FUNCS(strerror ioctl select fstat open fsync sleep)
|
1999-12-15 23:38:56 +01:00
|
|
|
AC_CHECK_FUNCS(gmtime_r localtime_r readdir_r getpwuid_r getcwd)
|
2000-09-11 02:35:51 +02:00
|
|
|
AC_CHECK_FUNCS(access stat mkdir rename rmdir unlink realpath)
|
|
|
|
AC_CHECK_FUNCS(iconv nl_langinfo)
|
1999-04-07 16:42:40 +02:00
|
|
|
AC_CHECK_FUNCS(inet_aton inet_addr, break)
|
1999-07-02 20:50:21 +02:00
|
|
|
AC_CHECK_FUNCS(inet_pton uname inet_ntoa)
|
2000-01-17 16:45:24 +01:00
|
|
|
AC_CHECK_FUNCS(backtrace fork execvp pipe)
|
|
|
|
AC_CHECK_HEADERS(execinfo.h unistd.h dlfcn.h)
|
2000-01-18 15:42:14 +01:00
|
|
|
AC_CHECK_LIB(dl, dladdr, [
|
|
|
|
AC_DEFINE(HAVE_DLADDR)])
|
2000-01-17 16:45:24 +01:00
|
|
|
AC_CHECK_FILES(/proc/self/exe, [
|
|
|
|
AC_DEFINE(HAVE_PROC_SELF_EXE)])
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
AC_CHECK_FUNCS(gethostbyname_r, [
|
|
|
|
AC_DEFINE(HAVE_GETHOSTBYNAME_R)
|
|
|
|
# There are two different kinds of gethostbyname_r.
|
|
|
|
# We look for the one that returns `int'.
|
|
|
|
# Hopefully this check is robust enough.
|
|
|
|
AC_EGREP_HEADER(int.*gethostbyname_r, netdb.h, [
|
1999-08-01 02:14:32 +02:00
|
|
|
AC_DEFINE(GETHOSTBYNAME_R_RETURNS_INT)])
|
|
|
|
|
|
|
|
case " $GCINCS " in
|
|
|
|
*" -D_REENTRANT "*) ;;
|
|
|
|
*)
|
|
|
|
dnl On DU4.0, gethostbyname_r is only declared with -D_REENTRANT
|
|
|
|
AC_CACHE_CHECK([whether gethostbyname_r declaration requires -D_REENTRANT],
|
|
|
|
[libjava_cv_gethostbyname_r_needs_reentrant],
|
|
|
|
[ AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
AC_TRY_COMPILE([#include <netdb.h>],
|
|
|
|
[gethostbyname_r("", 0, 0);],
|
|
|
|
[libjava_cv_gethostbyname_r_needs_reentrant=no], [dnl
|
|
|
|
CPPFLAGS_SAVE="$CPPFLAGS"
|
|
|
|
CPPFLAGS="$CPPFLAGS -D_REENTRANT"
|
|
|
|
AC_TRY_COMPILE([#include <netdb.h>], [gethostbyname_r("", 0, 0);],
|
|
|
|
[libjava_cv_gethostbyname_r_needs_reentrant=yes],
|
|
|
|
[libjava_cv_gethostbyname_r_needs_reentrant=fail])
|
|
|
|
CPPFLAGS="$CPPFLAGS_SAVE"
|
|
|
|
])
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
])
|
|
|
|
if test "x$libjava_cv_gethostbyname_r_needs_reentrant" = xyes; then
|
2000-04-21 22:46:11 +02:00
|
|
|
AC_DEFINE(_REENTRANT, 1, [Required define if using POSIX threads])
|
1999-08-01 02:14:32 +02:00
|
|
|
fi
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
AC_CACHE_CHECK([for struct hostent_data],
|
|
|
|
[libjava_cv_struct_hostent_data], [dnl
|
|
|
|
AC_TRY_COMPILE([
|
|
|
|
#if GETHOSTBYNAME_R_NEEDS_REENTRANT && !defined(_REENTRANT)
|
|
|
|
# define _REENTRANT 1
|
|
|
|
#endif
|
|
|
|
#include <netdb.h>], [struct hostent_data data;],
|
|
|
|
[libjava_cv_struct_hostent_data=yes],
|
|
|
|
[libjava_cv_struct_hostent_data=no])])
|
|
|
|
if test "x$libjava_cv_struct_hostent_data" = xyes; then
|
|
|
|
AC_DEFINE(HAVE_STRUCT_HOSTENT_DATA, 1,
|
|
|
|
[Define if struct hostent_data is defined in netdb.h])
|
|
|
|
fi
|
|
|
|
])
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
AC_CHECK_FUNCS(gethostbyaddr_r, [
|
|
|
|
AC_DEFINE(HAVE_GETHOSTBYADDR_R)
|
|
|
|
# There are two different kinds of gethostbyaddr_r.
|
|
|
|
# We look for the one that returns `int'.
|
|
|
|
# Hopefully this check is robust enough.
|
|
|
|
AC_EGREP_HEADER(int.*gethostbyaddr_r, netdb.h, [
|
|
|
|
AC_DEFINE(GETHOSTBYADDR_R_RETURNS_INT)])])
|
|
|
|
|
|
|
|
AC_CHECK_FUNCS(gethostname, [
|
|
|
|
AC_DEFINE(HAVE_GETHOSTNAME)
|
|
|
|
AC_EGREP_HEADER(gethostname, unistd.h, [
|
|
|
|
AC_DEFINE(HAVE_GETHOSTNAME_DECL)])])
|
|
|
|
|
1999-09-02 08:27:00 +02:00
|
|
|
# Look for these functions in the thread library, but only bother
|
|
|
|
# if using POSIX threads.
|
|
|
|
if test "$THREADS" = posix; then
|
|
|
|
save_LIBS="$LIBS"
|
|
|
|
LIBS="$LIBS $THREADLIBS"
|
|
|
|
# Some POSIX thread systems don't have pthread_mutexattr_settype.
|
|
|
|
# E.g., Solaris.
|
|
|
|
AC_CHECK_FUNCS(pthread_mutexattr_settype pthread_mutexattr_setkind_np)
|
|
|
|
|
|
|
|
# Look for sched_yield. Up to Solaris 2.6, it is in libposix4, since
|
|
|
|
# Solaris 7 the name librt is preferred.
|
|
|
|
AC_CHECK_FUNCS(sched_yield, , [
|
|
|
|
AC_CHECK_LIB(rt, sched_yield, [
|
|
|
|
AC_DEFINE(HAVE_SCHED_YIELD)
|
|
|
|
THREADLIBS="$THREADLIBS -lrt"
|
1999-09-10 02:10:04 +02:00
|
|
|
THREADSPEC="$THREADSPEC -lrt"], [
|
1999-09-02 08:27:00 +02:00
|
|
|
AC_CHECK_LIB(posix4, sched_yield, [
|
|
|
|
AC_DEFINE(HAVE_SCHED_YIELD)
|
|
|
|
THREADLIBS="$THREADLIBS -lposix4"
|
1999-09-10 02:10:04 +02:00
|
|
|
THREADSPEC="$THREADSPEC -lposix4"])])])
|
1999-09-02 08:27:00 +02:00
|
|
|
LIBS="$save_LIBS"
|
|
|
|
|
|
|
|
# We can save a little space at runtime if the mutex has m_count
|
|
|
|
# or __m_count. This is a nice hack for Linux.
|
|
|
|
AC_TRY_COMPILE([#include <pthread.h>], [
|
|
|
|
extern pthread_mutex_t *mutex; int q = mutex->m_count;
|
|
|
|
], AC_DEFINE(PTHREAD_MUTEX_HAVE_M_COUNT), [
|
|
|
|
AC_TRY_COMPILE([#include <pthread.h>], [
|
|
|
|
extern pthread_mutex_t *mutex; int q = mutex->__m_count;
|
|
|
|
], AC_DEFINE(PTHREAD_MUTEX_HAVE___M_COUNT))])
|
|
|
|
fi
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
# We require a way to get the time.
|
|
|
|
time_found=no
|
|
|
|
AC_CHECK_FUNCS(gettimeofday time ftime, time_found=yes)
|
|
|
|
if test "$time_found" = no; then
|
|
|
|
AC_MSG_ERROR([no function found to get the time])
|
|
|
|
fi
|
|
|
|
|
1999-08-01 01:41:15 +02:00
|
|
|
AC_CHECK_FUNCS(memmove)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
# We require memcpy.
|
|
|
|
memcpy_found=no
|
|
|
|
AC_CHECK_FUNCS(memcpy, memcpy_found=yes)
|
|
|
|
if test "$memcpy_found" = no; then
|
|
|
|
AC_MSG_ERROR([memcpy is required])
|
|
|
|
fi
|
|
|
|
|
1999-05-11 14:11:09 +02:00
|
|
|
# Some library-finding code we stole from Tcl.
|
|
|
|
#--------------------------------------------------------------------
|
|
|
|
# Check for the existence of the -lsocket and -lnsl libraries.
|
|
|
|
# The order here is important, so that they end up in the right
|
|
|
|
# order in the command line generated by make. Here are some
|
|
|
|
# special considerations:
|
|
|
|
# 1. Use "connect" and "accept" to check for -lsocket, and
|
|
|
|
# "gethostbyname" to check for -lnsl.
|
|
|
|
# 2. Use each function name only once: can't redo a check because
|
|
|
|
# autoconf caches the results of the last check and won't redo it.
|
|
|
|
# 3. Use -lnsl and -lsocket only if they supply procedures that
|
|
|
|
# aren't already present in the normal libraries. This is because
|
|
|
|
# IRIX 5.2 has libraries, but they aren't needed and they're
|
|
|
|
# bogus: they goof up name resolution if used.
|
|
|
|
# 4. On some SVR4 systems, can't use -lsocket without -lnsl too.
|
|
|
|
# To get around this problem, check for both libraries together
|
|
|
|
# if -lsocket doesn't work by itself.
|
|
|
|
#--------------------------------------------------------------------
|
|
|
|
|
|
|
|
AC_CACHE_CHECK([for socket libraries], gcj_cv_lib_sockets,
|
|
|
|
[gcj_cv_lib_sockets=
|
|
|
|
gcj_checkBoth=0
|
|
|
|
unset ac_cv_func_connect
|
|
|
|
AC_CHECK_FUNC(connect, gcj_checkSocket=0, gcj_checkSocket=1)
|
|
|
|
if test "$gcj_checkSocket" = 1; then
|
|
|
|
unset ac_cv_func_connect
|
|
|
|
AC_CHECK_LIB(socket, main, gcj_cv_lib_sockets="-lsocket",
|
|
|
|
gcj_checkBoth=1)
|
|
|
|
fi
|
|
|
|
if test "$gcj_checkBoth" = 1; then
|
|
|
|
gcj_oldLibs=$LIBS
|
|
|
|
LIBS="$LIBS -lsocket -lnsl"
|
|
|
|
unset ac_cv_func_accept
|
|
|
|
AC_CHECK_FUNC(accept,
|
|
|
|
[gcj_checkNsl=0
|
|
|
|
gcj_cv_lib_sockets="-lsocket -lnsl"])
|
|
|
|
unset ac_cv_func_accept
|
|
|
|
LIBS=$gcj_oldLibs
|
|
|
|
fi
|
|
|
|
unset ac_cv_func_gethostbyname
|
|
|
|
gcj_oldLibs=$LIBS
|
|
|
|
LIBS="$LIBS $gcj_cv_lib_sockets"
|
|
|
|
AC_CHECK_FUNC(gethostbyname, ,
|
|
|
|
[AC_CHECK_LIB(nsl, main,
|
|
|
|
[gcj_cv_lib_sockets="$gcj_cv_lib_sockets -lnsl"])])
|
|
|
|
unset ac_cv_func_gethostbyname
|
|
|
|
LIBS=$gcj_oldLIBS
|
|
|
|
])
|
|
|
|
SYSTEMSPEC="$SYSTEMSPEC $gcj_cv_lib_sockets"
|
|
|
|
|
|
|
|
if test "$with_system_zlib" = yes; then
|
|
|
|
AC_CHECK_LIB(z, deflate, ZLIBSPEC=-lz, ZLIBSPEC=-lzgcj)
|
|
|
|
else
|
|
|
|
ZLIBSPEC=-lzgcj
|
2000-03-04 22:50:19 +01:00
|
|
|
ZLIBTESTSPEC="-L`pwd`/../zlib/.libs -rpath `pwd`/../zlib/.libs"
|
1999-05-11 14:11:09 +02:00
|
|
|
fi
|
|
|
|
|
1999-05-12 18:22:58 +02:00
|
|
|
# On Solaris, and maybe other architectures, the Boehm collector
|
|
|
|
# requires -ldl.
|
|
|
|
if test "$GC" = boehm; then
|
|
|
|
AC_CHECK_LIB(dl, main, SYSTEMSPEC="$SYSTEMSPEC -ldl")
|
|
|
|
fi
|
|
|
|
|
2000-09-13 21:01:20 +02:00
|
|
|
if test -z "${with_multisubdir}"; then
|
|
|
|
builddotdot=.
|
|
|
|
else
|
|
|
|
changequote(<<,>>)
|
|
|
|
builddotdot=`echo ${with_multisubdir} | sed -e 's:[^/][^/]*:..:g'`
|
|
|
|
changequote([,])
|
|
|
|
fi
|
2000-10-09 19:19:49 +02:00
|
|
|
if test -x "${builddotdot}/../../gcc/gcj"; then
|
|
|
|
dir="`cd ${builddotdot}/../../gcc && pwd`"
|
2000-09-13 21:01:20 +02:00
|
|
|
GCJ="$dir/gcj -B`pwd`/ -B$dir/"
|
1999-05-07 20:44:38 +02:00
|
|
|
else
|
1999-04-07 16:42:40 +02:00
|
|
|
CANADIAN=yes
|
|
|
|
NULL_TARGET=yes
|
2000-09-13 21:01:20 +02:00
|
|
|
GCJ="gcj -B`pwd`/"
|
1999-05-07 20:44:38 +02:00
|
|
|
fi
|
1999-04-07 16:42:40 +02:00
|
|
|
fi
|
|
|
|
|
2000-09-13 21:01:20 +02:00
|
|
|
# Create it, so that compile/link tests don't fail
|
|
|
|
test -f libgcj.spec || touch libgcj.spec
|
|
|
|
GCJ="$GCJ -I$srcdir"
|
|
|
|
|
|
|
|
LT_AC_PROG_GCJ
|
|
|
|
|
[multiple changes]
2000-03-26 Tom Tromey <tromey@cygnus.com>
* java/lang/mprec.h: Use SIZEOF_VOID_P.
* interpret.cc: Use SIZEOF_VOID_P.
* include/java-cpool.h (_Jv_storeLong): Use SIZEOF_VOID_P.
(_Jv_loadLong): Likewise.
(_Jv_storeDouble): Likewise.
* configure: Rebuilt.
* configure.in: Check size of void*.
* resolve.cc (ncode): Use FFI_PREP_RAW_CLOSURE and FFI_RAW_SIZE.
2000-03-26 Hans Boehm <boehm@acm.org>
* include/java-cpool.h (_Jv_storeLong, _Jv_loadLong,
_Jv_storeDouble, _Jv_loadDouble): Define differently on 64 bit
machine.
* java/lang/ieeefp.h: Define __IEEE_BIG_ENDIAN or
__IEEE_LITTLE_ENDIAN appropriately on IA64.
* java/lang/mprec.h: Don't define Pack_32 on 64 bit machine.
* javaprims.h (_Jv_word): Added `l' and `d' entries in 64 bit
case.
* resolve.cc (FFI_PREP_RAW_CLOSURE): New define.
(FFI_RAW_SIZE): Likewise.
(_Jv_InterpMethod::ncode): Use them.
* interpret.cc (PUSHL, PUSHD, POPL, POPD, LOADL, LOADD, STOREL,
STORED): Define differently on a 64 bit machine.
(continue1): Use ffi_java_raw_call when appropriate.
From-SVN: r32754
2000-03-26 22:33:04 +02:00
|
|
|
dnl FIXME: cross compilation
|
|
|
|
AC_CHECK_SIZEOF(void *)
|
|
|
|
|
1999-05-11 14:11:09 +02:00
|
|
|
ZLIBS=
|
|
|
|
ZDEPS=
|
1999-05-21 15:09:54 +02:00
|
|
|
ZINCS=
|
1999-05-11 14:11:09 +02:00
|
|
|
if test "x$ZLIBSPEC" = "x-lzgcj"; then
|
|
|
|
# We include the path to the zlib build directory.
|
|
|
|
# See Makefile.am to understand why.
|
|
|
|
ZDEPS='$(top_builddir)/../zlib/libzgcj.la'
|
|
|
|
ZLIBS="$ZDEPS -L\$(here)/../zlib/$libsubdir"
|
1999-05-21 15:09:54 +02:00
|
|
|
ZINCS='-I$(top_srcdir)/../zlib'
|
1999-05-11 14:11:09 +02:00
|
|
|
else
|
|
|
|
ZLIBS="$ZLIBSPEC"
|
|
|
|
fi
|
|
|
|
AC_SUBST(ZLIBS)
|
|
|
|
AC_SUBST(ZDEPS)
|
1999-05-21 15:09:54 +02:00
|
|
|
AC_SUBST(ZINCS)
|
1999-08-05 07:21:44 +02:00
|
|
|
AC_SUBST(DIVIDESPEC)
|
1999-11-19 20:13:42 +01:00
|
|
|
AC_SUBST(EXCEPTIONSPEC)
|
1999-12-20 03:18:11 +01:00
|
|
|
AC_SUBST(FORCELIBGCCSPEC)
|
1999-05-11 14:11:09 +02:00
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
AM_CONDITIONAL(CANADIAN, test "$CANADIAN" = yes)
|
|
|
|
AM_CONDITIONAL(NULL_TARGET, test "$NULL_TARGET" = yes)
|
1999-10-07 01:13:37 +02:00
|
|
|
AM_CONDITIONAL(NATIVE, test "$NATIVE" = yes || test "$NULL_TARGET" = yes)
|
1999-06-21 15:03:47 +02:00
|
|
|
AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host")
|
1999-12-20 03:18:11 +01:00
|
|
|
AM_CONDITIONAL(NEEDS_DATA_START, test "$NEEDS_DATA_START" = yes && test "$NATIVE" = yes)
|
1999-04-07 16:42:40 +02:00
|
|
|
AC_SUBST(EH_COMMON_INCLUDE)
|
|
|
|
|
1999-05-07 20:44:38 +02:00
|
|
|
# Determine gcj version number.
|
|
|
|
changequote(<<,>>)
|
|
|
|
gcjvers="`$GCJ -v 2>&1 | sed -n 's/^.*version \([^ ]*\).*$/\1/p'`"
|
|
|
|
changequote([,])
|
|
|
|
AC_DEFINE_UNQUOTED(GCJVERSION, "$gcjvers")
|
|
|
|
|
1999-08-16 19:01:52 +02:00
|
|
|
# See if gcj supports -fuse-divide-subroutine. gcc 2.95 does not, and
|
|
|
|
# we want to continue to support that version.
|
1999-09-23 21:38:11 +02:00
|
|
|
AC_MSG_CHECKING([whether gcj supports -fuse-divide-subroutine])
|
1999-08-16 19:01:52 +02:00
|
|
|
cat > conftest.java << 'END'
|
|
|
|
public class conftest { }
|
|
|
|
END
|
|
|
|
use_fuse=yes
|
1999-10-02 02:19:01 +02:00
|
|
|
$GCJ -classpath $srcdir -fuse-divide-subroutine -fsyntax-only \
|
|
|
|
conftest.java > /dev/null 2>&1 \
|
1999-09-20 22:09:42 +02:00
|
|
|
|| use_fuse=no
|
1999-08-16 19:01:52 +02:00
|
|
|
rm -f conftest.java
|
|
|
|
if test "$use_fuse" = no; then
|
|
|
|
DIVIDESPEC=
|
|
|
|
fi
|
1999-09-23 21:38:11 +02:00
|
|
|
AC_MSG_RESULT($use_fuse)
|
1999-08-16 19:01:52 +02:00
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
AC_SUBST(AM_RUNTESTFLAGS)
|
|
|
|
|
2000-01-22 22:15:58 +01:00
|
|
|
dnl Work around a g++ bug. Reported to gcc-bugs@gcc.gnu.org on Jan 22, 2000.
|
|
|
|
AC_MSG_CHECKING([for g++ -ffloat-store bug])
|
|
|
|
save_CFLAGS="$CFLAGS"
|
|
|
|
CFLAGS="-x c++ -O2 -ffloat-store"
|
|
|
|
AC_TRY_COMPILE([#include <math.h>], ,
|
|
|
|
[AC_MSG_RESULT(no)],
|
|
|
|
[AC_DEFINE(__NO_MATH_INLINES)
|
|
|
|
AC_MSG_RESULT(yes)])
|
|
|
|
CFLAGS="$save_CFLAGS"
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
dnl We check for sys/filio.h because Solaris 2.5 defines FIONREAD there.
|
|
|
|
dnl On that system, sys/ioctl.h will not include sys/filio.h unless
|
|
|
|
dnl BSD_COMP is defined; just including sys/filio.h is simpler.
|
2000-09-11 02:35:51 +02:00
|
|
|
AC_CHECK_HEADERS(unistd.h bstring.h sys/time.h sys/types.h fcntl.h sys/ioctl.h sys/filio.h sys/stat.h sys/select.h sys/socket.h netinet/in.h arpa/inet.h netdb.h pwd.h sys/config.h inttypes.h stdint.h langinfo.h)
|
1999-04-07 16:42:40 +02:00
|
|
|
dnl We avoid AC_HEADER_DIRENT since we really only care about dirent.h
|
|
|
|
dnl for now. If you change this, you also must update natFile.cc.
|
|
|
|
AC_CHECK_HEADERS(dirent.h)
|
|
|
|
|
1999-08-21 15:15:55 +02:00
|
|
|
AC_CHECK_TYPE([ssize_t], [int])
|
1999-08-21 16:26:44 +02:00
|
|
|
|
|
|
|
AC_MSG_CHECKING([for in_addr_t])
|
|
|
|
AC_TRY_COMPILE([#include <sys/types.h>
|
|
|
|
#if STDC_HEADERS
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stddef.h>
|
|
|
|
#endif
|
|
|
|
#if HAVE_NETINET_IN_H
|
|
|
|
#include <netinet/in.h>
|
|
|
|
#endif], [in_addr_t foo;],
|
|
|
|
[AC_DEFINE([HAVE_IN_ADDR_T])
|
|
|
|
AC_MSG_RESULT(yes)],
|
|
|
|
[AC_MSG_RESULT(no)])
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([whether struct ip_mreq is in netinet/in.h])
|
|
|
|
AC_TRY_COMPILE([#include <netinet/in.h>], [struct ip_mreq mreq;],
|
|
|
|
[AC_DEFINE(HAVE_STRUCT_IP_MREQ)
|
|
|
|
AC_MSG_RESULT(yes)],
|
|
|
|
[AC_MSG_RESULT(no)])
|
1999-08-21 15:15:55 +02:00
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
AC_MSG_CHECKING([whether struct sockaddr_in6 is in netinet/in.h])
|
|
|
|
AC_TRY_COMPILE([#include <netinet/in.h>], [struct sockaddr_in6 addr6;],
|
|
|
|
[AC_DEFINE(HAVE_INET6)
|
|
|
|
AC_MSG_RESULT(yes)],
|
|
|
|
[AC_MSG_RESULT(no)])
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for socklen_t in sys/socket.h])
|
2000-10-09 19:19:49 +02:00
|
|
|
AC_TRY_COMPILE([#include <sys/types.h>
|
|
|
|
#include <sys/socket.h>], [socklen_t x = 5;],
|
1999-04-07 16:42:40 +02:00
|
|
|
[AC_DEFINE(HAVE_SOCKLEN_T)
|
|
|
|
AC_MSG_RESULT(yes)],
|
|
|
|
[AC_MSG_RESULT(no)])
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for tm_gmtoff in struct tm])
|
|
|
|
AC_TRY_COMPILE([#include <time.h>], [struct tm tim; tim.tm_gmtoff = 0;],
|
|
|
|
[AC_DEFINE(STRUCT_TM_HAS_GMTOFF)
|
|
|
|
AC_MSG_RESULT(yes)],
|
|
|
|
[AC_MSG_RESULT(no)
|
|
|
|
AC_MSG_CHECKING([for global timezone variable])
|
|
|
|
dnl FIXME: we don't want a link check here because that won't work
|
|
|
|
dnl when cross-compiling. So instead we make an assumption that
|
|
|
|
dnl the header file will mention timezone if it exists.
|
|
|
|
AC_TRY_COMPILE([#include <time.h>], [long z2 = timezone;],
|
|
|
|
[AC_DEFINE(HAVE_TIMEZONE)
|
|
|
|
AC_MSG_RESULT(yes)],
|
|
|
|
[AC_MSG_RESULT(no)])])
|
|
|
|
|
|
|
|
AC_FUNC_ALLOCA
|
|
|
|
|
|
|
|
AC_CHECK_PROGS(PERL, perl, false)
|
|
|
|
|
2000-05-19 19:55:34 +02:00
|
|
|
SYSDEP_SOURCES=
|
|
|
|
|
|
|
|
case "${host}" in
|
|
|
|
i?86-*-linux*)
|
|
|
|
SIGNAL_HANDLER=include/i386-signal.h
|
|
|
|
;;
|
|
|
|
sparc-sun-solaris*)
|
|
|
|
SIGNAL_HANDLER=include/sparc-signal.h
|
|
|
|
;;
|
|
|
|
ia64-*)
|
|
|
|
SYSDEP_SOURCES=sysdep/ia64.c
|
|
|
|
test -d sysdep || mkdir sysdep
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
SIGNAL_HANDLER=include/default-signal.h
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
# If we're using sjlj exceptions, forget what we just learned.
|
|
|
|
if test "$libgcj_sjlj" = yes; then
|
1999-11-19 20:13:42 +01:00
|
|
|
SIGNAL_HANDLER=include/default-signal.h
|
|
|
|
fi
|
1999-04-13 11:18:09 +02:00
|
|
|
|
2000-05-19 19:55:34 +02:00
|
|
|
AC_SUBST(SYSDEP_SOURCES)
|
|
|
|
|
1999-04-13 11:18:09 +02:00
|
|
|
AC_LINK_FILES($SIGNAL_HANDLER, include/java-signal.h)
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
if test "${multilib}" = "yes"; then
|
|
|
|
multilib_arg="--enable-multilib"
|
|
|
|
else
|
|
|
|
multilib_arg=
|
|
|
|
fi
|
|
|
|
|
|
|
|
here=`pwd`
|
|
|
|
AC_SUBST(here)
|
|
|
|
|
2000-03-04 22:50:19 +01:00
|
|
|
AC_OUTPUT(Makefile libgcj.spec libgcj-test.spec gcj/Makefile include/Makefile testsuite/Makefile,
|
1999-04-07 16:42:40 +02:00
|
|
|
[if test -n "$CONFIG_FILES"; then
|
|
|
|
ac_file=Makefile . ${libgcj_basedir}/../config-ml.in
|
|
|
|
fi],
|
|
|
|
srcdir=${srcdir}
|
|
|
|
host=${host}
|
|
|
|
target=${target}
|
|
|
|
with_multisubdir=${with_multisubdir}
|
|
|
|
ac_configure_args="${multilib_arg} ${ac_configure_args}"
|
|
|
|
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
|
|
|
|
libgcj_basedir=${libgcj_basedir}
|
|
|
|
CC="${CC}"
|
|
|
|
CXX="${CXX}"
|
|
|
|
)
|