summaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2001-12-19 02:45:20 +0000
committerbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2001-12-19 02:45:20 +0000
commit129d97eee6b6106e578a749dd8e46e41fd798a8a (patch)
treeb16f01328859461023cf943ea567b9642d4bc96a /libjava
parentd0eacdfad703fb7da60f462a10c400d7762d6763 (diff)
downloadgcc-129d97eee6b6106e578a749dd8e46e41fd798a8a.tar.gz
* boehm.cc (_Jv_BuildGCDescr): Define unconditionally.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@48170 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog1
-rw-r--r--libjava/boehm.cc6
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 <tromey@redhat.com>
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 *