Merge remote-tracking branch 'mfoliveira/ppc64el-v2'

[mono.git] / mono / metadata / sgen-marksweep.c

diff --git a/mono/metadata/sgen-marksweep.c b/mono/metadata/sgen-marksweep.c
index d60f8d045672488a00a5ac8ee66fd19583c3995d..88664226b9abdcec1108362a26abe1f9a24b2525 100644 (file)
--- a/mono/metadata/sgen-marksweep.c
+++ b/mono/metadata/sgen-marksweep.c
@@ -46,8 +46,13 @@
 
 #define SGEN_HAVE_CONCURRENT_MARK
 
-#define MS_BLOCK_SIZE_SHIFT    14      /* INT FASTENABLE */
-#define MS_BLOCK_SIZE          (1 << MS_BLOCK_SIZE_SHIFT)
+#if defined(ARCH_MIN_MS_BLOCK_SIZE) && defined(ARCH_MIN_MS_BLOCK_SIZE_SHIFT)
+#define MS_BLOCK_SIZE  ARCH_MIN_MS_BLOCK_SIZE
+#define MS_BLOCK_SIZE_SHIFT    ARCH_MIN_MS_BLOCK_SIZE_SHIFT
+#else
+#define MS_BLOCK_SIZE_SHIFT     14      /* INT FASTENABLE */
+#define MS_BLOCK_SIZE           (1 << MS_BLOCK_SIZE_SHIFT)
+#endif
 #define MAJOR_SECTION_SIZE     MS_BLOCK_SIZE
 #define CARDS_PER_BLOCK (MS_BLOCK_SIZE / CARD_SIZE_IN_BYTES)