diff options
| author | Bryce McKinlay <bryce@waitaki.otago.ac.nz> | 2001-05-24 07:28:39 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2001-05-24 08:28:39 +0100 |
| commit | 8948cb39720f8843baf5db391eceef189ddf7ec3 (patch) | |
| tree | 0f0b0bad7cad1bfd447ba149e43f7e3de42933cd /boehm-gc/tests/test.c | |
| parent | 678dbe56c08ce1f0508b4a75de8bbc0e547678df (diff) | |
| download | gcc-8948cb39720f8843baf5db391eceef189ddf7ec3.zip gcc-8948cb39720f8843baf5db391eceef189ddf7ec3.tar.gz gcc-8948cb39720f8843baf5db391eceef189ddf7ec3.tar.bz2 | |
Makefile.am: Override gctest_OBJECTS so tests/test.c can be built.
* Makefile.am: Override gctest_OBJECTS so tests/test.c can be built.
(libgcjgc_la_SOURCES): Remove typo.
* tests/test.c: Fix struct names and includes for GC_GCJ_SUPPORT case.
* Makefile.in: Rebuilt.
From-SVN: r42524
Diffstat (limited to 'boehm-gc/tests/test.c')
| -rw-r--r-- | boehm-gc/tests/test.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/boehm-gc/tests/test.c b/boehm-gc/tests/test.c index de58a6b..c7b537c 100644 --- a/boehm-gc/tests/test.c +++ b/boehm-gc/tests/test.c @@ -238,9 +238,9 @@ sexpr y; #ifdef GC_GCJ_SUPPORT -#include "gc_mark.h" -#include "dbg_mlc.h" -#include "include/gc_gcj.h" +#include "private/dbg_mlc.h" +#include "private/gc_pmark.h" +#include "gc_gcj.h" /* The following struct emulates the vtable in gcj. */ /* This assumes the default value of MARK_DESCR_OFFSET. */ @@ -253,12 +253,12 @@ struct fake_vtable gcj_class_struct1 = { 0, sizeof(struct SEXPR) + sizeof(struct fake_vtable *) }; /* length based descriptor. */ struct fake_vtable gcj_class_struct2 = - { 0, (3l << (CPP_WORDSZ - 3)) | DS_BITMAP}; + { 0, (3l << (CPP_WORDSZ - 3)) | GC_DS_BITMAP}; /* Bitmap based descriptor. */ struct GC_ms_entry * fake_gcj_mark_proc(word * addr, - struct ms_entry *mark_stack_ptr, - struct ms_entry *mark_stack_limit, + struct GC_ms_entry *mark_stack_ptr, + struct GC_ms_entry *mark_stack_limit, word env ) { sexpr x; @@ -273,7 +273,7 @@ struct GC_ms_entry * fake_gcj_mark_proc(word * addr, PUSH_CONTENTS((ptr_t)(x -> sexpr_cdr), mark_stack_ptr, mark_stack_limit, &(x -> sexpr_cdr), exit1); } - if ((ptr_t)(x -> sexpr_car) > GC_least_plausible_heap_addr) { + if ((ptr_t)(x -> sexpr_car) > (ptr_t) GC_least_plausible_heap_addr) { PUSH_CONTENTS((ptr_t)(x -> sexpr_car), mark_stack_ptr, mark_stack_limit, &(x -> sexpr_car), exit2); } |