diff options
| author | Hans Boehm <Hans_Boehm@hp.com> | 2001-12-14 18:43:55 +0000 |
|---|---|---|
| committer | Hans Boehm <hboehm@gcc.gnu.org> | 2001-12-14 18:43:55 +0000 |
| commit | 938f37772eae24bf9fd62530ed5f0bf0e43598ec (patch) | |
| tree | 5f0133888c909558a79f8bc0aa5a45088a22f853 /libjava/java/lang/Object.h | |
| parent | b6bfa8766be24c7e4064a386aa61caca54446f40 (diff) | |
| download | gcc-938f37772eae24bf9fd62530ed5f0bf0e43598ec.zip gcc-938f37772eae24bf9fd62530ed5f0bf0e43598ec.tar.gz gcc-938f37772eae24bf9fd62530ed5f0bf0e43598ec.tar.bz2 | |
prims.cc: Some old cleanups.
* libjava/prims.cc: Some old cleanups. The collector now
handles test for out of memory.
* libjava/prims.cc, libjava/gcj/javaprims.h:
(_Jv_AllocObjectNoInitNoFinalizer, _Jv_AllocObjectNoFinalizer):
New functions for finalizer-free allocation.
(jvmpi_notify_alloc): Became separate function.
* libjava/java/lang/Object.h, libjava/include/jvm.h: Adjust for
revised vtable layout on IA64. With TARGET_VTABLE_USES_DESCRIPTORS,
there is only one extra descriptor.
From-SVN: r48002
Diffstat (limited to 'libjava/java/lang/Object.h')
| -rw-r--r-- | libjava/java/lang/Object.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libjava/java/lang/Object.h b/libjava/java/lang/Object.h index 93e207f..b0d8270 100644 --- a/libjava/java/lang/Object.h +++ b/libjava/java/lang/Object.h @@ -21,8 +21,11 @@ struct _JvObjectPrefix { protected: // New ABI Compatibility Dummy, #1 and 2. - virtual void nacd_1 (void) {}; // This slot really contains the Class pointer. - virtual void nacd_2 (void) {}; // Actually the GC bitmap marking descriptor. + virtual void nacd_1 (void) {}; // This slot really contains the Class pointer. + // For IA64, the GC descriptor goes into the second word of the nacd1 descr. +# ifndef __ia64__ + virtual void nacd_2 (void) {}; // Actually the GC bitmap marking descriptor. +# endif }; class java::lang::Object : public _JvObjectPrefix |