diff options
| author | hboehm <hboehm@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-12-14 18:43:55 +0000 |
|---|---|---|
| committer | hboehm <hboehm@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-12-14 18:43:55 +0000 |
| commit | 096c057426b1d823bea30f34d6d70504e63d74b5 (patch) | |
| tree | 5f0133888c909558a79f8bc0aa5a45088a22f853 /libjava/java | |
| parent | 56685c176771ca7cd558b6139655f9da1bf7a5b9 (diff) | |
| download | ppe42-gcc-096c057426b1d823bea30f34d6d70504e63d74b5.tar.gz ppe42-gcc-096c057426b1d823bea30f34d6d70504e63d74b5.zip | |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@48002 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java')
| -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 93e207fc467..b0d82707c11 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 |
