From 619c238cb98cd3353b93d18db1c79c7f4d3a3ea8 Mon Sep 17 00:00:00 2001 From: Bryce McKinlay Date: Wed, 19 Dec 2001 02:45:20 +0000 Subject: [PATCH] * boehm.cc (_Jv_BuildGCDescr): Define unconditionally. From-SVN: r48170 --- libjava/ChangeLog | 1 + libjava/boehm.cc | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 833491565fb..cf601a26a9a 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -2,6 +2,7 @@ * include/jvm.h (_Jv_BuildGCDescr): Declare unconditionally. * nogc.cc (_Jv_BuildGCDescr): Define unconditionally. + * boehm.cc (_Jv_BuildGCDescr): Likewise. 2001-12-18 Tom Tromey diff --git a/libjava/boehm.cc b/libjava/boehm.cc index 2f2dc71a4f6..4dc60fc43b7 100644 --- a/libjava/boehm.cc +++ b/libjava/boehm.cc @@ -319,9 +319,8 @@ _Jv_MarkArray (void *addr, void *msp, void *msl, void * /*env*/) return mark_stack_ptr; } -// Return GC descriptor for interpreted class -#ifdef INTERPRETER - +// Generate a GC marking descriptor for a class. +// // We assume that the gcj mark proc has index 0. This is a dubious assumption, // since another one could be registered first. But the compiler also // knows this, so in that case everything else will break, too. @@ -332,7 +331,6 @@ _Jv_BuildGCDescr(jclass) /* FIXME: We should really look at the class and build the descriptor. */ return (void *)(GCJ_DEFAULT_DESCR); } -#endif // Allocate some space that is known to be pointer-free. void *