From cf5e8bf2ca1366b1d102f2fbe61eb546862e0f59 Mon Sep 17 00:00:00 2001 From: Mark Probst Date: Mon, 20 Dec 2010 20:55:16 +0100 Subject: [PATCH] [sgen] Make Mark&Sweep compile without card tables. --- mono/metadata/sgen-los.c | 2 ++ mono/metadata/sgen-marksweep.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mono/metadata/sgen-los.c b/mono/metadata/sgen-los.c index 2d8fa5801d8..1c100e1bf80 100644 --- a/mono/metadata/sgen-los.c +++ b/mono/metadata/sgen-los.c @@ -498,6 +498,7 @@ mono_sgen_los_iterate_live_block_ranges (sgen_cardtable_block_callback callback) } } +#ifdef SGEN_HAVE_CARDTABLE void mono_sgen_los_scan_card_table (SgenGrayQueue *queue) { @@ -507,5 +508,6 @@ mono_sgen_los_scan_card_table (SgenGrayQueue *queue) sgen_cardtable_scan_object (obj->data, obj->size, NULL, queue); } } +#endif #endif /* HAVE_SGEN_GC */ diff --git a/mono/metadata/sgen-marksweep.c b/mono/metadata/sgen-marksweep.c index 03141735c96..bcebdf3291d 100644 --- a/mono/metadata/sgen-marksweep.c +++ b/mono/metadata/sgen-marksweep.c @@ -1816,10 +1816,10 @@ mono_sgen_marksweep_init FILL_COLLECTOR_COPY_OBJECT (collector); FILL_COLLECTOR_SCAN_OBJECT (collector); - +#ifdef SGEN_HAVE_CARDTABLE /*cardtable requires major pages to be 8 cards aligned*/ g_assert ((MS_BLOCK_SIZE % (8 * CARD_SIZE_IN_BYTES)) == 0); - +#endif } #endif -- 2.25.1