diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2005-04-02 02:26:51 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@gcc.gnu.org> | 2005-04-02 02:26:51 +0000 |
| commit | b6121641fcd1aad93643d1f56440217ee9dc1c1c (patch) | |
| tree | de273602667841b3a2037c6f72fd0b12649073a4 /libjava/include | |
| parent | ca6ca8fa9cfa91366a8f5e8cb74b7791777c4eb8 (diff) | |
| download | gcc-b6121641fcd1aad93643d1f56440217ee9dc1c1c.zip gcc-b6121641fcd1aad93643d1f56440217ee9dc1c1c.tar.gz gcc-b6121641fcd1aad93643d1f56440217ee9dc1c1c.tar.bz2 | |
re PR libgcj/20090 (gij should be implemented in Java)
2005-04-01 Thomas Fitzsimmons <fitzsim@redhat.com>
* gcj.texi (Invoking gij): Add descriptions of new -X options.
Mention recognized-and-ignored compatibility options.
(Memory allocation): Add descriptions of JvMalloc, JvRealloc and
JvFree.
(About CNI): Add Memory allocation section.
2005-04-01 Thomas Fitzsimmons <fitzsim@redhat.com>
PR libgcj/20090, PR libgcj/20526
* gij.cc (nonstandard_opts_help): New function.
(add_option): New function.
(main): Support java options. Set java.class.path. Don't set
_Jv_Jar_Class_Path.
* prims.cc (parse_x_arg): New function.
(parse_init_args): Call parse_x_arg for -X and _ options, when
ignoreUnrecognized is true.
(new _Jv_RunMain): New vm_args variant.
(old _Jv_RunMain): Call new vm_args _Jv_RunMain.
(_Jv_Jar_Class_Path): Remove variable.
* include/java-props.h: Likewise.
* include/cni.h (JvRealloc): New function.
* include/jvm.h (_Jv_RunMain): Declare vm_args variant.
* java/lang/natRuntime.cc (insertSystemProperties): Remove
_Jv_Jar_Class_Path logic. Use JV_VERSION and JV_API_VERSION
macros.
* configure.ac (JV_VERSION): Define.
(JV_API_VERSION): Likewise.
* configure: Regenerate.
* include/config.h.in: Regenerate.
From-SVN: r97429
Diffstat (limited to 'libjava/include')
| -rw-r--r-- | libjava/include/config.h.in | 6 | ||||
| -rw-r--r-- | libjava/include/java-props.h | 3 | ||||
| -rw-r--r-- | libjava/include/jvm.h | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/libjava/include/config.h.in b/libjava/include/config.h.in index 8722869..04f8be0 100644 --- a/libjava/include/config.h.in +++ b/libjava/include/config.h.in @@ -364,6 +364,9 @@ /* Define if you want a bytecode interpreter. */ #undef INTERPRETER +/* API compatibility version string */ +#undef JV_API_VERSION + /* Define if hash synchronization is in use */ #undef JV_HASH_SYNCHRONIZATION @@ -373,6 +376,9 @@ /* Indicate that linker is not able to 8-byte align static data */ #undef JV_LINKER_CANNOT_8BYTE_ALIGN_STATICS +/* Compatibility version string */ +#undef JV_VERSION + /* Define if we want to use debug calls into the garbage collector. */ #undef LIBGCJ_GC_DEBUG diff --git a/libjava/include/java-props.h b/libjava/include/java-props.h index 19d7106..4302000 100644 --- a/libjava/include/java-props.h +++ b/libjava/include/java-props.h @@ -23,9 +23,6 @@ typedef struct extern const char **_Jv_Compiler_Properties; extern int _Jv_Properties_Count; -// The JAR file to add to the beginning of java.class.path. -extern const char *_Jv_Jar_Class_Path; - // Properties taken from the user's environment. extern property_pair *_Jv_Environment_Properties; diff --git a/libjava/include/jvm.h b/libjava/include/jvm.h index 7a5a4ea..a95b712 100644 --- a/libjava/include/jvm.h +++ b/libjava/include/jvm.h @@ -360,6 +360,9 @@ extern "C" void JvRunMain (jclass klass, int argc, const char **argv); void _Jv_RunMain (jclass klass, const char *name, int argc, const char **argv, bool is_jar); +void _Jv_RunMain (struct _Jv_VMInitArgs *vm_args, jclass klass, + const char *name, int argc, const char **argv, bool is_jar); + // Delayed until after _Jv_AllocBytes is declared. // // Note that we allocate this as unscanned memory -- the vtables |