diff options
| author | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-27 12:37:32 +0000 |
|---|---|---|
| committer | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-27 12:37:32 +0000 |
| commit | f31322193e16f434344570b0a8885405c3f216a0 (patch) | |
| tree | 900597a6d50287ab3119dd427bda46b0a85dee9e /libjava/link.cc | |
| parent | 3a4befb691b92f340c63f0582047b92a20bb5db0 (diff) | |
| download | ppe42-gcc-f31322193e16f434344570b0a8885405c3f216a0.tar.gz ppe42-gcc-f31322193e16f434344570b0a8885405c3f216a0.zip | |
2004-11-27 Andrew Haley <aph@redhat.com>
* link.cc (ensure_class_linked): Conditionally compile
_Jv_IsInterpretedClass on INTERPRETER.
(print_class_loaded): Likewise.
(wait_for_state): Likewise.
* include/jvm.h (ROUND): Move to here from include/java-interp.h.
* include/java-interp.h (ROUND): Remove.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@91375 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/link.cc')
| -rw-r--r-- | libjava/link.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/libjava/link.cc b/libjava/link.cc index 39ade1481a3..e611b766f24 100644 --- a/libjava/link.cc +++ b/libjava/link.cc @@ -1422,7 +1422,9 @@ _Jv_Linker::ensure_class_linked (jclass klass) // a reference to a class we can't access. This can validly // occur in an obscure case involving the InnerClasses // attribute. +#ifdef INTERPRETER if (! _Jv_IsInterpretedClass (klass)) +#endif { // Resolve class constants first, since other constant pool // entries may rely on these. @@ -1677,7 +1679,11 @@ _Jv_Linker::print_class_loaded (jclass klass) // We use a somewhat bogus test for the ABI here. char *abi; +#ifdef INTERPRETER if (_Jv_IsInterpretedClass (klass)) +#else + if (false) +#endif abi = "bytecode"; else if (klass->state == JV_STATE_PRELOADING) abi = "BC-compiled"; @@ -1714,7 +1720,10 @@ _Jv_Linker::wait_for_state (jclass klass, int state) if (gcj::verbose_class_flag && (klass->state == JV_STATE_COMPILED || klass->state == JV_STATE_PRELOADING) - && ! _Jv_IsInterpretedClass (klass)) +#ifdef INTERPRETER + && ! _Jv_IsInterpretedClass (klass) +#endif + ) print_class_loaded (klass); try |
