--with-java-runtime-library* and the defines respectively.
* configure.ac,
contrib/setenvinstalled.in,
contrib/setenvsource.in,
m4/hpi.m4,
src/cacao/Makefile.am,
src/cacaoh/cacaoh.c,
src/classes/Makefile.am,
src/native/include/Makefile.am,
src/native/jni.c,
src/native/native.c,
src/native/vm/Makefile.am,
src/native/vm/gnu/java_lang_VMClass.c,
src/native/vm/gnu/java_lang_VMClassLoader.c,
src/native/vm/nativevm.c,
src/native/vm/nativevm.h,
src/native/vm/reflect.c,
src/native/vm/reflect.h,
src/native/vm/sun_misc_Unsafe.c,
src/threads/posix/thread-posix.c,
src/threads/thread.c,
src/vm/access.c,
src/vm/assertion.c,
src/vm/initialize.c,
src/vm/jit/codegen-common.c,
src/vm/jit/jit.c,
src/vm/jit/stacktrace.c,
src/vm/properties.c,
src/vm/signal.c,
src/vm/vm.c,
src/vmcore/class.c,
src/vmcore/class.h,
src/vmcore/linker.c,
src/vmcore/loader.c,
src/vmcore/utf8.c,
src/vmcore/utf8.h: Likewise.
AC_CHECK_WITH_CACAOH
-AC_CHECK_WITH_CLASSPATH
+AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY
dnl Now we check for jre-layout so we can skip some checks that are
dnl not required.
AC_CHECK_ENABLE_JRE_LAYOUT
-AC_CHECK_WITH_CLASSPATH_PREFIX
-AC_CHECK_WITH_CLASSPATH_CLASSES
+AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_PREFIX
+AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_CLASSES
if test x"${ENABLE_JRE_LAYOUT}" = "xno"; then
- AC_CHECK_WITH_CLASSPATH_LIBDIR
+ AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR
fi
dnl The check for jni_md.h must be before jni.h.
AC_CHECK_WITH_JNI_H
dnl HPI is only required for OpenJDK
-case "${WITH_CLASSPATH}" in
- sun)
+case "${WITH_JAVA_RUNTIME_LIBRARY}" in
+ openjdk)
AC_CHECK_WITH_HPI_MD_H
AC_CHECK_WITH_HPI_H
;;
dnl check for some programs we need
-case "${WITH_CLASSPATH}" in
- cldc1.1 | gnu)
+case "${WITH_JAVA_RUNTIME_LIBRARY}" in
+ cldc1.1 | gnuclasspath)
AC_PROG_JAVAC
AC_PROG_JAR
;;
- sun)
+ openjdk)
;;
*)
- AC_MSG_ERROR(unknown classpath configuration ${WITH_CLASSPATH})
+ AC_MSG_ERROR(unknown classpath configuration ${WITH_JAVA_RUNTIME_LIBRARY})
;;
esac
export PATH=$PWD/src/cacao:$PATH
export LD_LIBRARY_PATH=$PWD/src/cacao/.libs
-export BOOTCLASSPATH=$PWD/src/classes/vm.zip:@CLASSPATH_CLASSES@
+export BOOTCLASSPATH=$PWD/src/classes/vm.zip:@JAVA_LIBRARY_CLASSES@
export LD_LIBRARY_PATH=\
$PWD/src/cacao/.libs:\
-@CLASSPATH_PREFIX@/native/jawt/.libs:\
-@CLASSPATH_PREFIX@/native/jni/gtk-peer/.libs:\
-@CLASSPATH_PREFIX@/native/jni/java-io/.libs:\
-@CLASSPATH_PREFIX@/native/jni/java-lang/.libs:\
-@CLASSPATH_PREFIX@/native/jni/java-net/.libs:\
-@CLASSPATH_PREFIX@/native/jni/java-nio/.libs:\
-@CLASSPATH_PREFIX@/native/jni/java-util/.libs:\
+@JAVA_LIBRARY_PREFIX@/native/jawt/.libs:\
+@JAVA_LIBRARY_PREFIX@/native/jni/gtk-peer/.libs:\
+@JAVA_LIBRARY_PREFIX@/native/jni/java-io/.libs:\
+@JAVA_LIBRARY_PREFIX@/native/jni/java-lang/.libs:\
+@JAVA_LIBRARY_PREFIX@/native/jni/java-net/.libs:\
+@JAVA_LIBRARY_PREFIX@/native/jni/java-nio/.libs:\
+@JAVA_LIBRARY_PREFIX@/native/jni/java-util/.libs:\
$LD_LIBRARY_PATH
-export BOOTCLASSPATH=$PWD/src/classes/vm.zip:@CLASSPATH_CLASSES@
+export BOOTCLASSPATH=$PWD/src/classes/vm.zip:@JAVA_LIBRARY_CLASSES@
dnl 02110-1301, USA.
-dnl which Java core library should we use
+dnl which Java runtime library should we use
-AC_DEFUN([AC_CHECK_WITH_CLASSPATH],[
-AC_MSG_CHECKING(which Java core library to use)
-AC_ARG_WITH([classpath],
- [AS_HELP_STRING(--with-classpath=<type>,specifies which type of classpath to use as Java core library (cldc1.1,gnu,sun) [[default=gnu]])],
+AC_DEFUN([AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY],[
+AC_MSG_CHECKING(which Java runtime library to use)
+AC_ARG_WITH([java-runtime-library],
+ [AS_HELP_STRING(--with-java-runtime-library=<type>,specifies which type of classpath to use as Java runtime library (cldc1.1,gnuclasspath,openjdk) [[default=gnuclasspath]])],
[case "${withval}" in
cldc1.1)
- WITH_CLASSPATH=cldc1.1
- AC_DEFINE([WITH_CLASSPATH_CLDC1_1], 1, [use Sun's CLDC1.1 classes])
- AC_SUBST(WITH_CLASSPATH_CLDC1_1)
+ WITH_JAVA_RUNTIME_LIBRARY=cldc1.1
+ AC_DEFINE([WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1], 1, [use Sun's CLDC1.1 classes])
+ AC_SUBST(WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1)
;;
- gnu)
- WITH_CLASSPATH=gnu
- AC_DEFINE([WITH_CLASSPATH_GNU], 1, [use GNU Classpath])
- AC_SUBST(WITH_CLASSPATH_GNU)
+ gnuclasspath)
+ WITH_JAVA_RUNTIME_LIBRARY=gnuclasspath
+ AC_DEFINE([WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH], 1, [use GNU Classpath])
+ AC_SUBST(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
;;
- sun)
- WITH_CLASSPATH=sun
- AC_DEFINE([WITH_CLASSPATH_SUN], 1, [use Sun's Java SE classes])
- AC_SUBST(WITH_CLASSPATH_SUN)
+ openjdk)
+ WITH_JAVA_RUNTIME_LIBRARY=openjdk
+ AC_DEFINE([WITH_JAVA_RUNTIME_LIBRARY_OPENJDK], 1, [use OpenJDK's Java SE classes])
+ AC_SUBST(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
;;
*)
AC_MSG_ERROR(unknown classpath ${withval})
;;
esac],
- [WITH_CLASSPATH=gnu
- AC_DEFINE([WITH_CLASSPATH_GNU], 1, [use GNU Classpath])
- AC_SUBST(WITH_CLASSPATH_GNU)])
-AC_MSG_RESULT(${WITH_CLASSPATH})
-AM_CONDITIONAL([WITH_CLASSPATH_CLDC1_1], test x"${WITH_CLASSPATH}" = "xcldc1.1")
-AM_CONDITIONAL([WITH_CLASSPATH_GNU], test x"${WITH_CLASSPATH}" = "xgnu")
-AM_CONDITIONAL([WITH_CLASSPATH_SUN], test x"${WITH_CLASSPATH}" = "xsun")
+ [WITH_JAVA_RUNTIME_LIBRARY=gnuclasspath
+ AC_DEFINE([WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH], 1, [use GNU Classpath])
+ AC_SUBST(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)])
+AC_MSG_RESULT(${WITH_JAVA_RUNTIME_LIBRARY})
+AM_CONDITIONAL([WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1], test x"${WITH_JAVA_RUNTIME_LIBRARY}" = "xcldc1.1")
+AM_CONDITIONAL([WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH], test x"${WITH_JAVA_RUNTIME_LIBRARY}" = "xgnuclasspath")
+AM_CONDITIONAL([WITH_JAVA_RUNTIME_LIBRARY_OPENJDK], test x"${WITH_JAVA_RUNTIME_LIBRARY}" = "xopenjdk")
])
-dnl where is Java core library installed
+dnl where is Java runtime library installed
-AC_DEFUN([AC_CHECK_WITH_CLASSPATH_PREFIX],[
-AC_MSG_CHECKING(where Java core library is installed)
-AC_ARG_WITH([classpath-prefix],
- [AS_HELP_STRING(--with-classpath-prefix=<dir>,installation directory of Java core library [[default=/usr/local/classpath]])],
- [CLASSPATH_PREFIX=${withval}],
- [CLASSPATH_PREFIX=/usr/local/classpath])
-AC_MSG_RESULT(${CLASSPATH_PREFIX})
-AC_DEFINE_UNQUOTED([CLASSPATH_PREFIX], "${CLASSPATH_PREFIX}", [Java core library installation directory])
-AC_SUBST(CLASSPATH_PREFIX)
+AC_DEFUN([AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_PREFIX],[
+AC_MSG_CHECKING(where Java runtime library is installed)
+AC_ARG_WITH([java-runtime-library-prefix],
+ [AS_HELP_STRING(--with-java-runtime-library-prefix=<dir>,installation directory of Java runtime library [[default=/usr/local/classpath]])],
+ [JAVA_RUNTIME_LIBRARY_PREFIX=${withval}],
+ [JAVA_RUNTIME_LIBRARY_PREFIX=/usr/local/classpath])
+AC_MSG_RESULT(${JAVA_RUNTIME_LIBRARY_PREFIX})
+AC_DEFINE_UNQUOTED([JAVA_RUNTIME_LIBRARY_PREFIX], "${JAVA_RUNTIME_LIBRARY_PREFIX}", [Java runtime library installation directory])
+AC_SUBST(JAVA_RUNTIME_LIBRARY_PREFIX)
])
-dnl where are Java core library classes installed
+dnl where are Java runtime library classes installed
-AC_DEFUN([AC_CHECK_WITH_CLASSPATH_CLASSES],[
-AC_MSG_CHECKING(where Java core library classes are installed)
-AC_ARG_WITH([classpath-classes],
- [AS_HELP_STRING(--with-classpath-classes=<path>,path to Java core library classes (includes the name of the file and may be flat) [[default=(gnu:${CLASSPATH_PREFIX}/share/classpath/glibj.zip,sun:${CLASSPATH_PREFIX}/control/build/${OS_DIR}-${JAVA_ARCH}/classes,*:${CLASSPATH_PREFIX})]])],
- [CLASSPATH_CLASSES=${withval}],
- [case "${WITH_CLASSPATH}" in
- gnu)
- CLASSPATH_CLASSES=${CLASSPATH_PREFIX}/share/classpath/glibj.zip
+AC_DEFUN([AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_CLASSES],[
+AC_MSG_CHECKING(where Java runtime library classes are installed)
+AC_ARG_WITH([java-runtime-library-classes],
+ [AS_HELP_STRING(--with-java-runtime-library-classes=<path>,path to Java runtime library classes (includes the name of the file and may be flat) [[default=(gnuclasspath:${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip,openjdk:${JAVA_RUNTIME_LIBRARY_PREFIX}/control/build/${OS_DIR}-${JAVA_ARCH}/classes,*:${JAVA_RUNTIME_LIBRARY_PREFIX})]])],
+ [JAVA_RUNTIME_LIBRARY_CLASSES=${withval}],
+ [case "${WITH_JAVA_RUNTIME_LIBRARY}" in
+ gnuclasspath)
+ JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip
;;
- sun)
- CLASSPATH_CLASSES=${CLASSPATH_PREFIX}/control/build/${OS_DIR}-${JAVA_ARCH}/classes
+ openjdk)
+ JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_PREFIX}/control/build/${OS_DIR}-${JAVA_ARCH}/classes
;;
*)
- CLASSPATH_CLASSES=${CLASSPATH_PREFIX}
+ JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_PREFIX}
;;
esac])
-AC_MSG_RESULT(${CLASSPATH_CLASSES})
-AC_DEFINE_UNQUOTED([CLASSPATH_CLASSES], "${CLASSPATH_CLASSES}", [Java core library classes])
-AC_SUBST(CLASSPATH_CLASSES)
+AC_MSG_RESULT(${JAVA_RUNTIME_LIBRARY_CLASSES})
+AC_DEFINE_UNQUOTED([JAVA_RUNTIME_LIBRARY_CLASSES], "${JAVA_RUNTIME_LIBRARY_CLASSES}", [Java runtime library classes])
+AC_SUBST(JAVA_RUNTIME_LIBRARY_CLASSES)
dnl define BOOTCLASSPATH for Makefiles
-case "${WITH_CLASSPATH}" in
- cldc1.1 | gnu)
- BOOTCLASSPATH="\$(top_builddir)/src/classes/classes:\$(CLASSPATH_CLASSES)"
+case "${WITH_JAVA_RUNTIME_LIBRARY}" in
+ cldc1.1 | gnuclasspath)
+ BOOTCLASSPATH="\$(top_builddir)/src/classes/classes:\$(JAVA_RUNTIME_LIBRARY_CLASSES)"
;;
*)
- BOOTCLASSPATH="\$(CLASSPATH_CLASSES)"
+ BOOTCLASSPATH="\$(JAVA_RUNTIME_LIBRARY_CLASSES)"
;;
esac
AC_SUBST(BOOTCLASSPATH)
])
-dnl where are Java core library native libraries installed
+dnl where are Java runtime library native libraries installed
-AC_DEFUN([AC_CHECK_WITH_CLASSPATH_LIBDIR],[
-AC_MSG_CHECKING(where Java core library native libraries are installed)
-AC_ARG_WITH([classpath-libdir],
- [AS_HELP_STRING(--with-classpath-libdir=<dir>,installation directory of Java core library native libraries [[default=(gnu:${CLASSPATH_PREFIX}/lib,sun:${CLASSPATH_PREFIX}/control/build/${OS_DIR}-${JAVA_ARCH}/lib/${JAVA_ARCH},*:${CLASSPATH_PREFIX})]])],
- [CLASSPATH_LIBDIR=${withval}],
- [case "${WITH_CLASSPATH}" in
- gnu)
- CLASSPATH_LIBDIR=${CLASSPATH_PREFIX}/lib
+AC_DEFUN([AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR],[
+AC_MSG_CHECKING(where Java runtime library native libraries are installed)
+AC_ARG_WITH([java-runtime-library-libdir],
+ [AS_HELP_STRING(--with-java-runtime-library-libdir=<dir>,installation directory of Java runtime library native libraries [[default=(gnuclasspath:${JAVA_RUNTIME_LIBRARY_PREFIX}/lib,openjdk:${JAVA_RUNTIME_LIBRARY_PREFIX}/control/build/${OS_DIR}-${JAVA_ARCH}/lib/${JAVA_ARCH},*:${JAVA_RUNTIME_LIBRARY_PREFIX})]])],
+ [JAVA_RUNTIME_LIBRARY_LIBDIR=${withval}],
+ [case "${WITH_JAVA_RUNTIME_LIBRARY}" in
+ gnuclasspath)
+ JAVA_RUNTIME_LIBRARY_LIBDIR=${JAVA_RUNTIME_LIBRARY_PREFIX}/lib
;;
- sun)
- CLASSPATH_LIBDIR=${CLASSPATH_PREFIX}/control/build/${OS_DIR}-${JAVA_ARCH}/lib/${JAVA_ARCH}
+ openjdk)
+ JAVA_RUNTIME_LIBRARY_LIBDIR=${JAVA_RUNTIME_LIBRARY_PREFIX}/control/build/${OS_DIR}-${JAVA_ARCH}/lib/${JAVA_ARCH}
;;
*)
- CLASSPATH_LIBDIR=${CLASSPATH_PREFIX}
+ JAVA_RUNTIME_LIBRARY_LIBDIR=${JAVA_RUNTIME_LIBRARY_PREFIX}
;;
esac])
-AC_MSG_RESULT(${CLASSPATH_LIBDIR})
+AC_MSG_RESULT(${JAVA_RUNTIME_LIBRARY_LIBDIR})
-dnl expand CLASSPATH_LIBDIR to something that is usable in C code
-AS_AC_EXPAND([CLASSPATH_LIBDIR], ${CLASSPATH_LIBDIR})
-AC_DEFINE_UNQUOTED([CLASSPATH_LIBDIR], "${CLASSPATH_LIBDIR}", [Java core library native libraries installation directory])
-AC_SUBST(CLASSPATH_LIBDIR)
+dnl expand JAVA_RUNTIME_LIBRARY_LIBDIR to something that is usable in C code
+AS_AC_EXPAND([JAVA_RUNTIME_LIBRARY_LIBDIR], ${JAVA_RUNTIME_LIBRARY_LIBDIR})
+AC_DEFINE_UNQUOTED([JAVA_RUNTIME_LIBRARY_LIBDIR], "${JAVA_RUNTIME_LIBRARY_LIBDIR}", [Java runtime library native libraries installation directory])
+AC_SUBST(JAVA_RUNTIME_LIBRARY_LIBDIR)
])
AC_DEFUN([AC_CHECK_WITH_JNI_MD_H],[
AC_MSG_CHECKING(where jni_md.h is installed)
AC_ARG_WITH([jni_md_h],
- [AS_HELP_STRING(--with-jni_md_h=<dir>,path to jni_md.h [[default=(sun:${CLASSPATH_PREFIX}/jdk/src/solaris/javavm/export,*:${CLASSPATH_PREFIX}/include)]])],
+ [AS_HELP_STRING(--with-jni_md_h=<dir>,path to jni_md.h [[default=(openjdk:${JAVA_RUNTIME_LIBRARY_PREFIX}/jdk/src/solaris/javavm/export,*:${JAVA_RUNTIME_LIBRARY_PREFIX}/include)]])],
[WITH_JNI_MD_H=${withval}],
- [case "${WITH_CLASSPATH}" in
- sun)
- WITH_JNI_MD_H=${CLASSPATH_PREFIX}/jdk/src/solaris/javavm/export
+ [case "${WITH_JAVA_RUNTIME_LIBRARY}" in
+ openjdk)
+ WITH_JNI_MD_H=${JAVA_RUNTIME_LIBRARY_PREFIX}/jdk/src/solaris/javavm/export
;;
*)
- WITH_JNI_MD_H=${CLASSPATH_PREFIX}/include
+ WITH_JNI_MD_H=${JAVA_RUNTIME_LIBRARY_PREFIX}/include
;;
esac])
AC_MSG_RESULT(${WITH_JNI_MD_H})
CPPFLAGS="${CPPFLAGS} -I${WITH_JNI_MD_H}"
AC_CHECK_HEADER([${WITH_JNI_MD_H}/jni_md.h],
- [AC_DEFINE_UNQUOTED([INCLUDE_JNI_MD_H], "${WITH_JNI_MD_H}/jni_md.h", [Java core library jni_md.h header])],
+ [AC_DEFINE_UNQUOTED([INCLUDE_JNI_MD_H], "${WITH_JNI_MD_H}/jni_md.h", [Java runtime library jni_md.h header])],
[AC_MSG_ERROR(cannot find jni_md.h)])
])
AC_DEFUN([AC_CHECK_WITH_JNI_H],[
AC_MSG_CHECKING(where jni.h is installed)
AC_ARG_WITH([jni_h],
- [AS_HELP_STRING(--with-jni_h=<dir>,path to jni.h [[default=(sun:${CLASSPATH_PREFIX}/jdk/src/share/javavm/export,*:${CLASSPATH_PREFIX}/include)]])],
+ [AS_HELP_STRING(--with-jni_h=<dir>,path to jni.h [[default=(openjdk:${JAVA_RUNTIME_LIBRARY_PREFIX}/jdk/src/share/javavm/export,*:${JAVA_RUNTIME_LIBRARY_PREFIX}/include)]])],
[WITH_JNI_H=${withval}],
- [case "${WITH_CLASSPATH}" in
- sun)
- WITH_JNI_H=${CLASSPATH_PREFIX}/jdk/src/share/javavm/export
+ [case "${WITH_JAVA_RUNTIME_LIBRARY}" in
+ openjdk)
+ WITH_JNI_H=${JAVA_RUNTIME_LIBRARY_PREFIX}/jdk/src/share/javavm/export
;;
*)
- WITH_JNI_H=${CLASSPATH_PREFIX}/include
+ WITH_JNI_H=${JAVA_RUNTIME_LIBRARY_PREFIX}/include
;;
esac])
AC_MSG_RESULT(${WITH_JNI_H})
CPPFLAGS="${CPPFLAGS} -I${WITH_JNI_H}"
AC_CHECK_HEADER([${WITH_JNI_H}/jni.h],
- [AC_DEFINE_UNQUOTED([INCLUDE_JNI_H], "${WITH_JNI_H}/jni.h", [Java core library jni.h header])],
+ [AC_DEFINE_UNQUOTED([INCLUDE_JNI_H], "${WITH_JNI_H}/jni.h", [Java runtime library jni.h header])],
[AC_MSG_ERROR(cannot find jni.h)],
[#include INCLUDE_JNI_MD_H])
])
AC_DEFUN([AC_CHECK_WITH_HPI_MD_H],[
AC_MSG_CHECKING(where hpi_md.h is installed)
AC_ARG_WITH([hpi_md_h],
- [AS_HELP_STRING(--with-hpi_md_h=<dir>,path to hpi_md.h (only with --with-classpath=sun) [[default=${CLASSPATH_PREFIX}/jdk/src/solaris/hpi/export]])],
+ [AS_HELP_STRING(--with-hpi_md_h=<dir>,path to hpi_md.h (only with --with-java-runtime-library=openjdk) [[default=${JAVA_RUNTIME_LIBRARY_PREFIX}/jdk/src/solaris/hpi/export]])],
[WITH_HPI_MD_H=${withval}],
- [case "${WITH_CLASSPATH}" in
- sun)
- WITH_HPI_MD_H=${CLASSPATH_PREFIX}/jdk/src/solaris/hpi/export
+ [case "${WITH_JAVA_RUNTIME_LIBRARY}" in
+ openjdk)
+ WITH_HPI_MD_H=${JAVA_RUNTIME_LIBRARY_PREFIX}/jdk/src/solaris/hpi/export
;;
*)
;;
AC_DEFUN([AC_CHECK_WITH_HPI_H],[
AC_MSG_CHECKING(where hpi.h is installed)
AC_ARG_WITH([hpi_h],
- [AS_HELP_STRING(--with-hpi_h=<dir>,path to hpi.h (only with --with-classpath=sun) [[default=${CLASSPATH_PREFIX}/jdk/src/share/hpi/export]])],
+ [AS_HELP_STRING(--with-hpi_h=<dir>,path to hpi.h (only with --with-java-runtime-library=openjdk) [[default=${JAVA_RUNTIME_LIBRARY_PREFIX}/jdk/src/share/hpi/export]])],
[WITH_HPI_H=${withval}],
- [WITH_HPI_H=${CLASSPATH_PREFIX}/jdk/src/share/hpi/export])
+ [WITH_HPI_H=${JAVA_RUNTIME_LIBRARY_PREFIX}/jdk/src/share/hpi/export])
AC_MSG_RESULT(${WITH_HPI_H})
dnl We use CPPFLAGS so hpi.h can find hpi_md.h
libjvm_la_LDFLAGS = \
-version-info 1:0:0
-if WITH_CLASSPATH_SUN
+if WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
libjvm_la_LDFLAGS += \
-Xlinker --version-script=$(top_srcdir)/contrib/mapfile-vers-product
endif
/* src/cacaoh/cacaoh.c - main for header generation (cacaoh)
- Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
- C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
- E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
- J. Wenninger, Institut f. Computersprachen - TU Wien
+ Copyright (C) 1996-2005, 2006, 2007, 2008
+ CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
This file is part of CACAO.
}
else {
cplen =
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
strlen(CACAO_VM_ZIP) +
strlen(":") +
#endif
- strlen(CLASSPATH_CLASSES) +
+ strlen(JAVA_RUNTIME_LIBRARY_CLASSES) +
strlen("0");
bootclasspath = MNEW(char, cplen);
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
strcat(bootclasspath, CACAO_VM_ZIP);
strcat(bootclasspath, ":");
#endif
- strcat(bootclasspath, CLASSPATH_CLASSES);
+ strcat(bootclasspath, JAVA_RUNTIME_LIBRARY_CLASSES);
}
EXTRA_DIST = \
- $(VM_JAVA_FILES_GNU) \
- $(VM_JAVA_FILES_GNU_ANNOTATIONS) \
+ $(VM_JAVA_FILES_GNU_CLASSPATH) \
+ $(VM_JAVA_FILES_GNU_CLASSPATH_ANNOTATIONS) \
$(VM_JAVA_FILES_CLDC1_1)
CLEANFILES = vm.zip
-VM_JAVA_FILES_GNU = \
+VM_JAVA_FILES_GNU_CLASSPATH = \
$(top_srcdir)/src/classes/gnu/gnu/classpath/VMStackWalker.java \
$(top_srcdir)/src/classes/gnu/gnu/classpath/VMSystemProperties.java \
$(top_srcdir)/src/classes/gnu/gnu/java/lang/VMCPStringBuilder.java \
# Remove these files when a new GNU Classpath release (> 0.97.1) is
# available.
-VM_JAVA_FILES_GNU += \
+VM_JAVA_FILES_GNU_CLASSPATH += \
$(top_srcdir)/src/classes/gnu/java/lang/reflect/Constructor.java \
$(top_srcdir)/src/classes/gnu/java/lang/reflect/Field.java \
$(top_srcdir)/src/classes/gnu/java/lang/reflect/Method.java \
$(top_srcdir)/src/classes/gnu/java/lang/reflect/Modifier.java \
$(top_srcdir)/src/classes/gnu/gnu/java/lang/CPStringBuilder.java
-VM_JAVA_FILES_GNU_ANNOTATIONS = \
+VM_JAVA_FILES_GNU_CLASSPATH_ANNOTATIONS = \
$(top_srcdir)/src/classes/gnu/sun/reflect/ConstantPool.java \
$(top_srcdir)/src/classes/gnu/sun/reflect/annotation/ExceptionProxy.java \
$(top_srcdir)/src/classes/gnu/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java \
BOOTCLASSPATH = $(top_builddir)/src/classes/classes:$(CLASSPATH_CLASSES)
-if WITH_CLASSPATH_GNU
+if WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH
VM_JAVA_FILES = \
- $(VM_JAVA_FILES_GNU)
+ $(VM_JAVA_FILES_GNU_CLASSPATH)
if ENABLE_ANNOTATIONS
VM_JAVA_FILES += \
- $(VM_JAVA_FILES_GNU_ANNOTATIONS)
+ $(VM_JAVA_FILES_GNU_CLASSPATH_ANNOTATIONS)
endif
if ENABLE_ZLIB
endif
endif
-if WITH_CLASSPATH_CLDC1_1
+if WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1
VM_JAVA_FILES = \
$(VM_JAVA_FILES_CLDC1_1)
java_util_concurrent_atomic_AtomicLong.h \
sun_misc_Unsafe.h
-if WITH_CLASSPATH_GNU
+if WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH
JAVASE_HEADER_FILES += \
java_lang_VMThread.h \
java_lang_VMThrowable.h \
endif
endif
-if WITH_CLASSPATH_SUN
+if WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
JAVASE_HEADER_FILES += \
java_lang_AssertionStatusDirectives.h \
java_nio_ByteBuffer.h \
gnu_classpath_jdwp_event_EventRequest.h \
gnu_classpath_jdwp_util_VariableTable.h
-if WITH_CLASSPATH_GNU
+if WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH
ADDITIONAL_IMPLEMENTED_VM_CLASSES_HEADER_FILES = \
gnu_classpath_VMStackWalker.h \
gnu_classpath_VMSystemProperties.h \
$(GEN_JVMTI_HEADER_FILES)
endif
-if WITH_CLASSPATH_GNU
+if WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH
VM_ZIP = $(top_builddir)/src/classes/vm.zip
endif
-if WITH_CLASSPATH_CLDC1_1
+if WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1
VM_ZIP = $(top_builddir)/src/classes/vm.zip
endif
#include "native/native.h"
#if defined(ENABLE_JAVASE)
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
# include "native/include/gnu_classpath_Pointer.h"
# if SIZEOF_VOID_P == 8
#if defined(ENABLE_JAVASE)
-# if defined(WITH_CLASSPATH_SUN)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
# include "native/include/java_nio_ByteBuffer.h" /* required by j.l.CL */
# endif
# include "native/include/java_nio_Buffer.h"
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
# include "native/include/java_lang_reflect_VMConstructor.h"
# include "native/include/java_lang_reflect_VMField.h"
# include "native/include/java_lang_reflect_VMMethod.h"
#if defined(ENABLE_JAVASE)
static classinfo *class_java_nio_Buffer;
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
static classinfo *class_java_nio_DirectByteBufferImpl;
static classinfo *class_java_nio_DirectByteBufferImpl_ReadWrite;
static methodinfo *dbbirw_init;
-# elif defined(WITH_CLASSPATH_SUN)
+# elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
static classinfo *class_sun_nio_ch_DirectBuffer;
static classinfo *class_java_nio_DirectByteBuffer;
!link_class(class_java_nio_Buffer))
return false;
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
if (!(class_java_nio_DirectByteBufferImpl =
load_class_bootstrap(utf_new_char("java/nio/DirectByteBufferImpl"))) ||
return false;
# endif
-# elif defined(WITH_CLASSPATH_SUN)
+# elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
if (!(class_sun_nio_ch_DirectBuffer =
load_class_bootstrap(utf_new_char("sun/nio/ch/DirectBuffer"))))
methodinfo *m;
int32_t slot;
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
java_lang_reflect_VMMethod *rvmm;
java_lang_reflect_VMConstructor *rvmc;
#endif
if (o->vftbl->clazz == class_java_lang_reflect_Constructor) {
rc = (java_lang_reflect_Constructor *) method;
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
LLNI_field_get_ref(rc, cons , rvmc);
LLNI_field_get_cls(rvmc, clazz, c);
LLNI_field_get_val(rvmc, slot , slot);
-#elif defined(WITH_CLASSPATH_SUN)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
LLNI_field_get_cls(rc, clazz, c);
LLNI_field_get_val(rc, slot , slot);
rm = (java_lang_reflect_Method *) method;
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
LLNI_field_get_ref(rm, m , rvmm);
LLNI_field_get_cls(rvmm, clazz, c);
LLNI_field_get_val(rvmm, slot , slot);
-#elif defined(WITH_CLASSPATH_SUN)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
LLNI_field_get_cls(rm, clazz, c);
LLNI_field_get_val(rm, slot , slot);
fieldinfo *f;
int32_t slot;
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
java_lang_reflect_VMField *rvmf;
#endif
if (rf == NULL)
return NULL;
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
LLNI_field_get_ref(rf, f, rvmf);
LLNI_field_get_cls(rvmf, clazz, c);
LLNI_field_get_val(rvmf, slot , slot);
-#elif defined(WITH_CLASSPATH_SUN)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
LLNI_field_get_cls(rf, clazz, c);
LLNI_field_get_val(rf, slot , slot);
jobject _Jv_JNI_NewDirectByteBuffer(JNIEnv *env, void *address, jlong capacity)
{
#if defined(ENABLE_JAVASE)
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
java_handle_t *nbuf;
# if SIZEOF_VOID_P == 8
return _Jv_JNI_NewLocalRef(env, nbuf);
-# elif defined(WITH_CLASSPATH_SUN)
+# elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
jobject o;
int64_t addr;
#if defined(ENABLE_JAVASE)
java_handle_t *h;
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
java_nio_DirectByteBufferImpl *nbuf;
gnu_classpath_Pointer *po;
return p;
-# elif defined(WITH_CLASSPATH_SUN)
+# elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
java_nio_Buffer *o;
int64_t address;
jlong _Jv_JNI_GetDirectBufferCapacity(JNIEnv* env, jobject buf)
{
-#if defined(ENABLE_JAVASE) && defined(WITH_CLASSPATH_GNU)
+#if defined(ENABLE_JAVASE) && defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
java_handle_t *o;
java_nio_Buffer *nbuf;
jlong capacity;
u4 key; /* hashkey */
u4 slot; /* slot in hashtable */
#endif
-#if defined(WITH_CLASSPATH_SUN)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
methodinfo *method_findNative;
java_handle_t *s;
#endif
le = le->hashlink;
}
-# if defined(WITH_CLASSPATH_SUN)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
if (f == NULL) {
/* We can resolve the function directly from
java.lang.ClassLoader as it's a static function. */
gnu \
sun
-if WITH_CLASSPATH_CLDC1_1
+if WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1
SUBDIRS = \
cldc1.1
cldc1.1/libnativevmcore.la
endif
-if WITH_CLASSPATH_GNU
+if WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH
SUBDIRS = \
gnu
gnu/libnativevmcore.la
endif
-if WITH_CLASSPATH_SUN
+if WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
SUBDIRS = \
sun
#include "vmcore/class.h"
-#if defined(WITH_CLASSPATH_GNU) && defined(ENABLE_ANNOTATIONS)
+#if defined(ENABLE_ANNOTATIONS)
#include "native/include/sun_reflect_ConstantPool.h"
#include "vm/vm.h"
{ "forName", "(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;", (void *) (uintptr_t) &Java_java_lang_VMClass_forName },
{ "isArray", "(Ljava/lang/Class;)Z", (void *) (uintptr_t) &Java_java_lang_VMClass_isArray },
{ "throwException", "(Ljava/lang/Throwable;)V", (void *) (uintptr_t) &Java_java_lang_VMClass_throwException },
-#if defined(WITH_CLASSPATH_GNU) && defined(ENABLE_ANNOTATIONS)
+#if defined(ENABLE_ANNOTATIONS)
{ "getDeclaredAnnotations", "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;", (void *) (uintptr_t) &Java_java_lang_VMClass_getDeclaredAnnotations },
#endif
{ "getEnclosingClass", "(Ljava/lang/Class;)Ljava/lang/Class;", (void *) (uintptr_t) &Java_java_lang_VMClass_getEnclosingClass },
}
-#if defined(WITH_CLASSPATH_GNU) && defined(ENABLE_ANNOTATIONS)
+#if defined(ENABLE_ANNOTATIONS)
/*
* Class: java/lang/VMClass
* Method: getDeclaredAnnotations
o = LLNI_classinfo_wrap(c);
-#if defined(WITH_CLASSPATH_GNU)
/* set ProtectionDomain */
LLNI_field_set_ref(o, pd, pd);
-#endif
return o;
}
#include "vmcore/options.h"
#include "vmcore/system.h"
-#if defined(WITH_CLASSPATH_SUN)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
# include "mm/memory.h"
# include "native/native.h"
/* Register native methods of all classes implemented. */
#if defined(ENABLE_JAVASE)
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
TRACESUBSYSTEMINITIALIZATION("nativevm_preinit");
_Jv_sun_reflect_ConstantPool_init();
#endif
-# elif defined(WITH_CLASSPATH_SUN)
+# elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
char *boot_library_path;
int len;
{
#if defined(ENABLE_JAVASE)
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
TRACESUBSYSTEMINITIALIZATION("nativevm_init");
/* nothing to do */
-# elif defined(WITH_CLASSPATH_SUN)
+# elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
methodinfo *m;
void nativevm_init(void);
#if defined(ENABLE_JAVASE)
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
void _Jv_gnu_classpath_VMStackWalker_init();
void _Jv_gnu_classpath_VMSystemProperties_init();
void _Jv_sun_reflect_ConstantPool_init();
#endif
-# elif defined(WITH_CLASSPATH_SUN)
+# elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
void _Jv_sun_misc_Unsafe_init();
#include "native/include/java_lang_String.h"
-#if defined(WITH_CLASSPATH_SUN)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
# include "native/include/java_nio_ByteBuffer.h" /* required by j.l.CL */
#endif
#include "native/include/java_lang_ClassLoader.h"
#include "native/include/java_lang_reflect_Field.h"
#include "native/include/java_lang_reflect_Method.h"
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
# include "native/include/java_lang_reflect_VMConstructor.h"
# include "native/include/java_lang_reflect_VMField.h"
# include "native/include/java_lang_reflect_VMMethod.h"
#endif
-#if defined(ENABLE_ANNOTATIONS) && defined(WITH_CLASSPATH_GNU)
+#if defined(ENABLE_ANNOTATIONS) && defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
# include "vm/vm.h"
# include "native/include/sun_reflect_ConstantPool.h"
#endif
java_lang_reflect_Constructor *rc;
int32_t slot;
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
java_lang_reflect_VMConstructor *rvmc;
#endif
slot = m - m->clazz->methods;
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
/* Allocate a java.lang.reflect.VMConstructor object. */
LLNI_field_set_ref(rvmc, annotations, method_get_annotations(m));
LLNI_field_set_ref(rvmc, parameterAnnotations, method_get_parameterannotations(m));
-#elif defined(WITH_CLASSPATH_SUN)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
/* Set Java object instance fields. */
java_lang_reflect_Field *rf;
int32_t slot;
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
java_lang_reflect_VMField *rvmf;
#endif
slot = f - f->clazz->fields;
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
/* Allocate a java.lang.reflect.VMField object. */
LLNI_field_set_val(rvmf, slot, slot);
LLNI_field_set_ref(rvmf, annotations, field_get_annotations(f));
-#elif defined(WITH_CLASSPATH_SUN)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
/* Set the Java object fields. */
java_lang_reflect_Method *rm;
int32_t slot;
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
java_lang_reflect_VMMethod *rvmm;
#endif
slot = m - m->clazz->methods;
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
/* Allocate a java.lang.reflect.VMMethod object. */
LLNI_field_set_ref(rvmm, parameterAnnotations, method_get_parameterannotations(m));
LLNI_field_set_ref(rvmm, annotationDefault, method_get_annotationdefault(m));
-#elif defined(WITH_CLASSPATH_SUN)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
LLNI_field_set_cls(rm, clazz, m->clazz);
/* Should we bypass security the checks (AccessibleObject)? */
if (override == false) {
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
/* This method is always called like this:
[0] java.lang.reflect.Method.invokeNative (Native Method)
[1] java.lang.reflect.Method.invoke (Method.java:329)
if (!access_check_method(m, 2))
return NULL;
-#elif defined(WITH_CLASSPATH_SUN)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
/* We only pass 1 here as stacktrace_get_caller_class, which
is called from access_check_method, skips
java.lang.reflect.Method.invoke(). */
if (!access_check_method(m, 1))
return NULL;
+#else
+# error unknown classpath configuration
#endif
}
}
-#if defined(WITH_CLASSPATH_GNU) && defined(ENABLE_ANNOTATIONS)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH) && defined(ENABLE_ANNOTATIONS)
/* reflect_get_declaredannotatios *********************************************
Calls the annotation parser with the unparsed annotations and returnes
#include "native/include/java_lang_String.h"
#if defined(ENABLE_JAVASE)
-# if defined(WITH_CLASSPATH_SUN)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
# include "native/include/java_nio_ByteBuffer.h" /* required by j.l.CL */
# endif
# include "native/include/java_lang_ClassLoader.h"
java_handle_t *reflect_constructor_newinstance(methodinfo *m, java_handle_objectarray_t *args, bool override);
java_handle_t *reflect_method_invoke(methodinfo *m, java_handle_t *o, java_handle_objectarray_t *args, bool override);
-#if defined(WITH_CLASSPATH_GNU) && defined(ENABLE_ANNOTATIONS)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH) && defined(ENABLE_ANNOTATIONS)
struct java_util_Map* reflect_get_declaredannotatios(
java_handle_bytearray_t *annotations,
java_lang_Class *declaringClass,
#include "native/include/java_lang_Object.h" /* before c.l.C */
#include "native/include/java_lang_String.h" /* required by j.l.CL */
-#if defined(WITH_CLASSPATH_SUN)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
# include "native/include/java_nio_ByteBuffer.h" /* required by j.l.CL */
#endif
#include "native/include/java_lang_Thread.h" /* required by s.m.U */
#include "native/include/java_lang_Throwable.h"
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
# include "native/include/java_lang_reflect_VMField.h"
#endif
fieldinfo *f;
int32_t slot;
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
java_lang_reflect_VMField *rvmf;
#endif
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
LLNI_field_get_ref(field, f, rvmf);
LLNI_field_get_cls(rvmf, clazz, c);
LLNI_field_get_val(rvmf, slot , slot);
-#elif defined(WITH_CLASSPATH_SUN)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
LLNI_field_get_cls(field, clazz, c);
LLNI_field_get_val(field, slot , slot);
fieldinfo *f;
int32_t slot;
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
java_lang_reflect_VMField *rvmf;
#endif
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
LLNI_field_get_ref(rf, f, rvmf);
LLNI_field_get_cls(rvmf, clazz, c);
LLNI_field_get_val(rvmf, slot , slot);
-#elif defined(WITH_CLASSPATH_SUN)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
LLNI_field_get_cls(rf, clazz, c);
LLNI_field_get_val(rf, slot , slot);
o = LLNI_classinfo_wrap(c);
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
/* set ProtectionDomain */
LLNI_field_set_ref(o, pd, protectionDomain);
# include "native/include/java_lang_ThreadGroup.h"
#endif
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
# include "native/include/java_lang_VMThread.h"
#endif
startupinfo *startup;
threadobject *t;
java_lang_Thread *object;
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
java_lang_VMThread *vmt;
#endif
sem_t *psem;
/* find and run the Thread.run()V method if no other function was passed */
if (function == NULL) {
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
/* We need to start the run method of
java.lang.VMThread. Since this is a final class, we can use
the class object directly. */
c = class_java_lang_VMThread;
-#elif defined(WITH_CLASSPATH_SUN) || defined(WITH_CLASSPATH_CLDC1_1)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK) || defined(WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1)
LLNI_class_get(object, c);
#else
# error unknown classpath configuration
_Jv_jvm->java_lang_management_ThreadMXBean_PeakThreadCount =
_Jv_jvm->java_lang_management_ThreadMXBean_ThreadCount;
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
/* we need to start the run method of java.lang.VMThread */
LLNI_field_get_ref(object, vmThread, vmt);
o = (java_handle_t *) vmt;
-#elif defined(WITH_CLASSPATH_SUN) || defined(WITH_CLASSPATH_CLDC1_1)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK) || defined(WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1)
o = (java_handle_t *) object;
#else
# error unknown classpath configuration
to build the java_lang_Thread_UncaughtExceptionHandler
header file with cacaoh. */
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
LLNI_field_get_ref(object, exceptionHandler, handler);
-# elif defined(WITH_CLASSPATH_SUN)
+# elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
LLNI_field_get_ref(object, uncaughtExceptionHandler, handler);
# endif
if (group != NULL) {
LLNI_class_get(group, c);
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
m = class_resolveclassmethod(c,
utf_removeThread,
utf_java_lang_Thread__V,
class_java_lang_ThreadGroup,
true);
-# elif defined(WITH_CLASSPATH_SUN)
+# elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
m = class_resolveclassmethod(c,
utf_remove,
utf_java_lang_Thread__V,
# include "native/include/java_lang_ThreadGroup.h"
#endif
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
# include "native/include/java_lang_VMThread.h"
#endif
/* Cache the java.lang.Thread initialization method. */
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
thread_method_init =
class_resolveclassmethod(class_java_lang_Thread,
class_java_lang_Thread,
true);
-#elif defined(WITH_CLASSPATH_SUN)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
thread_method_init =
class_resolveclassmethod(class_java_lang_Thread,
class_java_lang_Thread,
true);
-#elif defined(WITH_CLASSPATH_CLDC1_1)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1)
thread_method_init =
class_resolveclassmethod(class_java_lang_Thread,
java_handle_t *o;
java_lang_Thread *to;
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
java_lang_VMThread *vmto;
classinfo *c;
methodinfo *m;
thread_set_object(t, (java_handle_t *) to);
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
/* Create a java.lang.VMThread Java object. */
if (exceptions_get_exception())
return false;
-#elif defined(WITH_CLASSPATH_SUN)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
/* OpenJDK's java.lang.Thread does not have a VMThread field in
the class. Nothing to do here. */
if (exceptions_get_exception())
return false;
-#elif defined(WITH_CLASSPATH_CLDC1_1)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1)
/* Set the thread data-structure in the Java thread object. */
static void thread_create_initial_threadgroups(void)
{
#if defined(ENABLE_JAVASE)
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
/* Allocate and initialize the main thread group. */
threadgroup_system = threadgroup_main;
-# elif defined(WITH_CLASSPATH_SUN)
+# elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
java_handle_t *name;
methodinfo *m;
{
java_lang_Thread *to;
threadobject *t;
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
java_lang_VMThread *vmto;
#endif
thread_set_object(t, object);
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
/* Get the java.lang.VMThread object and do some sanity checks. */
LLNI_field_set_val(vmto, vmdata, (java_lang_Object *) t);
-#elif defined(WITH_CLASSPATH_SUN)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
/* Nothing to do. */
-#elif defined(WITH_CLASSPATH_CLDC1_1)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1)
LLNI_field_set_val(to, vm_thread, (java_lang_Object *) t);
{
java_lang_Thread *to;
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
java_lang_String *name;
-#elif defined(WITH_CLASSPATH_SUN) || defined(WITH_CLASSPATH_CLDC1_1)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK) || defined(WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1)
java_chararray_t *name;
#endif
LLNI_field_get_ref(to, name, name);
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
javastring_fprint((java_handle_t *) name, stream);
-#elif defined(WITH_CLASSPATH_SUN) || defined(WITH_CLASSPATH_CLDC1_1)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK) || defined(WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1)
/* FIXME: In OpenJDK and CLDC the name is a char[]. */
/* FIXME This prints to stdout. */
threadobject *thread_get_thread(java_handle_t *h)
{
threadobject *t;
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
java_lang_VMThread *vmto;
java_lang_Object *to;
#endif
-#if defined(WITH_CLASSPATH_SUN)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
bool equal;
#endif
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
vmto = (java_lang_VMThread *) h;
t = (threadobject *) to;
-#elif defined(WITH_CLASSPATH_SUN)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
/* XXX This is just a quick hack. */
threadlist_unlock();
-#elif defined(WITH_CLASSPATH_CLDC1_1)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1)
log_println("threads_get_thread: IMPLEMENT ME!");
if (SAME_PACKAGE(referer, cls))
return true;
-#if defined(WITH_CLASSPATH_SUN)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
/* Code for Sun's OpenJDK (see
hotspot/src/share/vm/runtime/reflection.cpp
(Reflection::verify_class_access)): Allow all accesses from
if (memberflags & ACC_PUBLIC)
return true;
-#if defined(WITH_CLASSPATH_SUN)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
/* Code for Sun's OpenJDK (see
hotspot/src/share/vm/runtime/reflection.cpp
(Reflection::verify_class_access)): Allow all accesses from
if ((len > 2) && (strcmp(name + (len - 3), "...") == 0)) {
package = true;
assertion_package_count += 1;
-#if defined(WITH_CLASSPATH_SUN)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
buf[len - 2] = '\0';
buf[len - 3] = '/';
#else
len = system_strlen(buf);
for (i = 0; i < len; i++) {
-#if defined(WITH_CLASSPATH_SUN)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
if (buf[i] == '.') {
buf[i] = '/';
}
TRACESUBSYSTEMINITIALIZATION("initialize_init");
#if defined(ENABLE_JAVASE)
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
/* Nothing. */
-# elif defined(WITH_CLASSPATH_SUN)
+# elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
if (!initialize_class(class_java_lang_String))
vm_abort("initialize_init: Initialization failed: java.lang.String");
#include "native/localref.h"
#include "native/native.h"
-#if defined(WITH_CLASSPATH_SUN)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
# include "native/include/java_lang_Object.h"
# include "native/include/java_lang_String.h" /* required by j.l.CL */
# include "native/include/java_nio_ByteBuffer.h" /* required by j.l.CL */
# include "native/include/java_lang_ClassLoader.h"
#endif
-#if defined(WITH_CLASSPATH_CLDC1_1)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1)
# include "native/include/java_lang_String.h"
#endif
RT_TIMING_GET_TIME(time_checks);
-#if defined(WITH_CLASSPATH_SUN)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
/* Code for Sun's OpenJDK (see
hotspot/src/share/vm/classfile/verifier.cpp
(Verifier::is_eligible_for_verification)): Don't verify
#include "native/include/java_lang_Object.h"
#include "native/include/java_lang_Throwable.h"
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
# include "native/include/gnu_classpath_Pointer.h"
# include "native/include/java_lang_VMThrowable.h"
#endif
/* Check "fillInStackTrace" only once, so we negate the
flag after the first time check. */
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
/* For GNU Classpath we also need to skip
VMThrowable.fillInStackTrace(). */
if (m->flags & ACC_METHOD_BUILTIN)
continue;
-#if defined(WITH_CLASSPATH_SUN)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
/* NOTE: See hotspot/src/share/vm/runtime/vframe.cpp
(vframeStreamCommon::security_get_caller_frame). */
*******************************************************************************/
-#if defined(ENABLE_JAVASE) && defined(WITH_CLASSPATH_GNU)
+#if defined(ENABLE_JAVASE) && defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
java_handle_objectarray_t *stacktrace_get_stack(void)
{
stackframeinfo_t *sfi;
{
java_lang_Throwable *o;
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
java_lang_VMThrowable *vmt;
#endif
/* now print the stacktrace */
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
LLNI_field_get_ref(o, vmState, vmt);
LLNI_field_get_ref(vmt, vmdata, backtrace);
-#elif defined(WITH_CLASSPATH_SUN) || defined(WITH_CLASSPATH_CLDC1_1)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK) || defined(WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1)
LLNI_field_get_ref(o, backtrace, backtrace);
char *extdirs;
char *endorseddirs;
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
char *cwd;
char *env_user;
char *env_home;
p = system_dirname(p);
p = system_dirname(p);
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
/* Set java.home. */
strcpy(boot_library_path, java_home);
strcat(boot_library_path, "/lib/classpath");
-# elif defined(WITH_CLASSPATH_SUN)
+# elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
/* Find correct java.home. We check if there is a JRE
co-located. */
#else
java_home = CACAO_PREFIX;
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
- boot_library_path = CLASSPATH_LIBDIR"/classpath";
+ boot_library_path = JAVA_RUNTIME_LIBRARY_LIBDIR"/classpath";
-# elif defined(WITH_CLASSPATH_SUN)
+# elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
- boot_library_path = CLASSPATH_LIBDIR;
+ boot_library_path = JAVA_RUNTIME_LIBRARY_LIBDIR;
-# elif defined(WITH_CLASSPATH_CLDC1_1)
+# elif defined(WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1)
/* No boot_library_path required. */
}
else {
#if defined(ENABLE_JRE_LAYOUT)
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
len =
strlen(java_home) + strlen("/share/cacao/vm.zip:") +
strcat(boot_class_path, java_home);
strcat(boot_class_path, "/share/classpath/glibj.zip");
-# elif defined(WITH_CLASSPATH_SUN)
+# elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
/* This is the bootclasspath taken from HotSpot (see
hotspot/src/share/vm/runtime/os.cpp
# error unknown classpath configuration
# endif
#else
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
len =
strlen(CACAO_VM_ZIP) +
strlen(":") +
- strlen(CLASSPATH_CLASSES) +
+ strlen(JAVA_RUNTIME_LIBRARY_CLASSES) +
strlen("0");
boot_class_path = MNEW(char, len);
strcpy(boot_class_path, CACAO_VM_ZIP);
strcat(boot_class_path, ":");
- strcat(boot_class_path, CLASSPATH_CLASSES);
+ strcat(boot_class_path, JAVA_RUNTIME_LIBRARY_CLASSES);
-# elif defined(WITH_CLASSPATH_SUN)
+# elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
/* This is the bootclasspath taken from HotSpot (see
hotspot/src/share/vm/runtime/os.cpp
(os::set_boot_path)). */
len =
- strlen(CLASSPATH_PREFIX"/lib/resources.jar:") +
- strlen(CLASSPATH_PREFIX"/lib/rt.jar:") +
- strlen(CLASSPATH_PREFIX"/lib/sunrsasign.jar:") +
- strlen(CLASSPATH_PREFIX"/lib/jsse.jar:") +
- strlen(CLASSPATH_PREFIX"/lib/jce.jar:") +
- strlen(CLASSPATH_PREFIX"/lib/charsets.jar:") +
- strlen(CLASSPATH_PREFIX"/classes") +
+ strlen(JAVA_RUNTIME_LIBRARY_PREFIX"/lib/resources.jar:") +
+ strlen(JAVA_RUNTIME_LIBRARY_PREFIX"/lib/rt.jar:") +
+ strlen(JAVA_RUNTIME_LIBRARY_PREFIX"/lib/sunrsasign.jar:") +
+ strlen(JAVA_RUNTIME_LIBRARY_PREFIX"/lib/jsse.jar:") +
+ strlen(JAVA_RUNTIME_LIBRARY_PREFIX"/lib/jce.jar:") +
+ strlen(JAVA_RUNTIME_LIBRARY_PREFIX"/lib/charsets.jar:") +
+ strlen(JAVA_RUNTIME_LIBRARY_PREFIX"/classes") +
strlen("0");
boot_class_path = MNEW(char, len);
- strcpy(boot_class_path, CLASSPATH_PREFIX"/lib/resources.jar:");
- strcat(boot_class_path, CLASSPATH_PREFIX"/lib/rt.jar:");
- strcat(boot_class_path, CLASSPATH_PREFIX"/lib/sunrsasign.jar:");
- strcat(boot_class_path, CLASSPATH_PREFIX"/lib/jsse.jar:");
- strcat(boot_class_path, CLASSPATH_PREFIX"/lib/jce.jar:");
- strcat(boot_class_path, CLASSPATH_PREFIX"/lib/charsets.jar:");
- strcat(boot_class_path, CLASSPATH_PREFIX"/classes");
+ strcpy(boot_class_path, JAVA_RUNTIME_LIBRARY_PREFIX"/lib/resources.jar:");
+ strcat(boot_class_path, JAVA_RUNTIME_LIBRARY_PREFIX"/lib/rt.jar:");
+ strcat(boot_class_path, JAVA_RUNTIME_LIBRARY_PREFIX"/lib/sunrsasign.jar:");
+ strcat(boot_class_path, JAVA_RUNTIME_LIBRARY_PREFIX"/lib/jsse.jar:");
+ strcat(boot_class_path, JAVA_RUNTIME_LIBRARY_PREFIX"/lib/jce.jar:");
+ strcat(boot_class_path, JAVA_RUNTIME_LIBRARY_PREFIX"/lib/charsets.jar:");
+ strcat(boot_class_path, JAVA_RUNTIME_LIBRARY_PREFIX"/classes");
-# elif defined(WITH_CLASSPATH_CLDC1_1)
+# elif defined(WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1)
len =
- strlen(CLASSPATH_CLASSES) +
+ strlen(JAVA_RUNTIME_LIBRARY_CLASSES) +
strlen("0");
boot_class_path = MNEW(char, len);
- strcpy(boot_class_path, CLASSPATH_CLASSES);
+ strcpy(boot_class_path, JAVA_RUNTIME_LIBRARY_CLASSES);
# else
# error unknown classpath configuration
properties_add("java.vm.info", "JIT mode");
}
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
/* Get properties from system. */
properties_add("user.country", "US");
}
-# elif defined(WITH_CLASSPATH_SUN)
+# elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
/* Actually this property is set by OpenJDK, but we need it in
nativevm_preinit(). */
if (sigemptyset(&mask) != 0)
vm_abort_errno("signal_init: sigemptyset failed");
-#if !defined(WITH_CLASSPATH_SUN)
+#if !defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
/* Let OpenJDK handle SIGINT itself. */
if (sigaddset(&mask, SIGINT) != 0)
if (sigemptyset(&mask) != 0)
vm_abort_errno("signal_thread: sigemptyset failed");
-#if !defined(WITH_CLASSPATH_SUN)
+#if !defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
/* Let OpenJDK handle SIGINT itself. */
if (sigaddset(&mask, SIGINT) != 0)
#include "native/include/java_lang_Object.h" /* required by j.l.C */
#include "native/include/java_lang_String.h" /* required by j.l.C */
-#if defined(WITH_CLASSPATH_SUN)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
# include "native/include/java_nio_ByteBuffer.h" /* required by j.l.CL */
# include "native/include/java_lang_ClassLoader.h" /* required by j.l.C */
#endif
/* When we're building with JRE-layout, the default paths are the
same as the runtime paths. */
#else
-# if defined(WITH_CLASSPATH_GNU)
- puts(" gnu.classpath.boot.library.path: "CLASSPATH_LIBDIR);
- puts(" java.boot.class.path : "CACAO_VM_ZIP":"CLASSPATH_CLASSES"");
-# elif defined(WITH_CLASSPATH_SUN)
- puts(" sun.boot.library.path : "CLASSPATH_LIBDIR);
- puts(" java.boot.class.path : "CLASSPATH_CLASSES);
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
+ puts(" gnu.classpath.boot.library.path: "JAVA_RUNTIME_LIBRARY_LIBDIR);
+ puts(" java.boot.class.path : "CACAO_VM_ZIP":"JAVA_RUNTIME_LIBRARY_CLASSES"");
+# elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
+ puts(" sun.boot.library.path : "JAVA_RUNTIME_LIBRARY_LIBDIR);
+ puts(" java.boot.class.path : "JAVA_RUNTIME_LIBRARY_CLASSES);
# endif
#endif
printf(" initial heap size : %d\n", opt_heapstartsize);
printf(" stack size : %d\n", opt_stacksize);
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
printf(" gnu.classpath.boot.library.path: %s\n", properties_get("gnu.classpath.boot.library.path"));
-#elif defined(WITH_CLASSPATH_SUN)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
printf(" sun.boot.library.path : %s\n", properties_get("sun.boot.library.path"));
#endif
classinfo *class_java_lang_Throwable;
classinfo *class_java_io_Serializable;
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
classinfo *class_java_lang_VMSystem;
classinfo *class_java_lang_VMThread;
classinfo *class_java_lang_VMThrowable;
classinfo *class_java_lang_ClassNotFoundException;
classinfo *class_java_lang_RuntimeException;
-#if defined(WITH_CLASSPATH_SUN)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
classinfo *class_sun_reflect_MagicAccessorImpl;
#endif
classinfo *class_java_util_Vector;
classinfo *class_java_util_HashMap;
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
classinfo *class_java_lang_reflect_VMConstructor;
classinfo *class_java_lang_reflect_VMField;
classinfo *class_java_lang_reflect_VMMethod;
# if defined(ENABLE_ANNOTATIONS)
classinfo *class_sun_reflect_ConstantPool;
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
classinfo *class_sun_reflect_annotation_AnnotationParser;
# endif
# endif
}
#if defined(ENABLE_JAVASE)
-# if defined(WITH_CLASSPATH_SUN)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
/* Store the protection domain. */
c->protectiondomain = pd;
typedef struct {
java_object_t header;
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
intptr_t padding[4];
-#elif defined(WITH_CLASSPATH_SUN)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
intptr_t padding[19];
-#elif defined(WITH_CLASSPATH_CLDC1_1)
+#elif defined(WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1)
intptr_t padding[3];
#else
# error unknown classpath configuration
classloader_t *classloader; /* NULL for bootstrap classloader */
#if defined(ENABLE_JAVASE)
-# if defined(WITH_CLASSPATH_SUN)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
java_object_t *protectiondomain;
java_objectarray_t *signers;
# endif
extern classinfo *class_java_lang_ClassNotFoundException;
extern classinfo *class_java_lang_RuntimeException;
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
extern classinfo *class_java_lang_VMSystem;
extern classinfo *class_java_lang_VMThread;
extern classinfo *class_java_lang_VMThrowable;
#endif
-#if defined(WITH_CLASSPATH_SUN)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
extern classinfo *class_sun_reflect_MagicAccessorImpl;
#endif
extern classinfo *class_java_util_Vector;
extern classinfo *class_java_util_HashMap;
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
extern classinfo *class_java_lang_reflect_VMConstructor;
extern classinfo *class_java_lang_reflect_VMField;
extern classinfo *class_java_lang_reflect_VMMethod;
# if defined(ENABLE_ANNOTATIONS)
extern classinfo *class_sun_reflect_ConstantPool;
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
extern classinfo *class_sun_reflect_annotation_AnnotationParser;
# endif
# endif
if (!link_class(class_java_lang_Throwable))
vm_abort("linker_init: linking failed");
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
if (!link_class(class_java_lang_VMSystem))
vm_abort("linker_init: linking failed");
if (!link_class(class_java_lang_reflect_Method))
vm_abort("linker_init: linking failed");
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
if (!link_class(class_java_lang_reflect_VMConstructor))
vm_abort("linker_init: linking failed");
if (!link_class(class_java_util_HashMap))
vm_abort("linker_init: linking failed");
-# if defined(WITH_CLASSPATH_SUN)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
if (!link_class(class_sun_reflect_MagicAccessorImpl))
vm_abort("linker_init: linking failed");
# endif
class_java_lang_Throwable = load_class_bootstrap(utf_java_lang_Throwable);
-#if defined(WITH_CLASSPATH_GNU)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
class_java_lang_VMSystem =
load_class_bootstrap(utf_new_char("java/lang/VMSystem"));
class_java_lang_reflect_Field = load_class_bootstrap(utf_java_lang_reflect_Field);
class_java_lang_reflect_Method = load_class_bootstrap(utf_java_lang_reflect_Method);
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
class_java_lang_reflect_VMConstructor = load_class_bootstrap(utf_java_lang_reflect_VMConstructor);
class_java_lang_reflect_VMField = load_class_bootstrap(utf_java_lang_reflect_VMField);
class_java_lang_reflect_VMMethod = load_class_bootstrap(utf_java_lang_reflect_VMMethod);
class_java_util_HashMap = load_class_bootstrap(utf_new_char("java/util/HashMap"));
class_java_util_Vector = load_class_bootstrap(utf_java_util_Vector);
-# if defined(WITH_CLASSPATH_SUN)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
class_sun_reflect_MagicAccessorImpl =
load_class_bootstrap(utf_new_char("sun/reflect/MagicAccessorImpl"));
# endif
class_sun_reflect_ConstantPool =
load_class_bootstrap(utf_new_char("sun/reflect/ConstantPool"));
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
/* needed by GNU Classpaths annotation support */
class_sun_reflect_annotation_AnnotationParser =
load_class_bootstrap(utf_new_char("sun/reflect/annotation/AnnotationParser"));
LLNI_class_get(cl, c);
-#if defined(WITH_CLASSPATH_SUN)
+#if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
/* OpenJDK uses this internal function because it's
synchronized. */
utf *utf_java_lang_reflect_Field;
utf *utf_java_lang_reflect_Method;
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
utf *utf_java_lang_reflect_VMConstructor;
utf *utf_java_lang_reflect_VMField;
utf *utf_java_lang_reflect_VMMethod;
utf_java_lang_reflect_Field = utf_new_char("java/lang/reflect/Field");
utf_java_lang_reflect_Method = utf_new_char("java/lang/reflect/Method");
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
utf_java_lang_reflect_VMConstructor = utf_new_char("java/lang/reflect/VMConstructor");
utf_java_lang_reflect_VMField = utf_new_char("java/lang/reflect/VMField");
utf_java_lang_reflect_VMMethod = utf_new_char("java/lang/reflect/VMMethod");
extern utf *utf_java_lang_reflect_Field;
extern utf *utf_java_lang_reflect_Method;
-# if defined(WITH_CLASSPATH_GNU)
+# if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
extern utf *utf_java_lang_reflect_VMConstructor;
extern utf *utf_java_lang_reflect_VMField;
extern utf *utf_java_lang_reflect_VMMethod;
projects / cacao.git / commitdiff