From: Zoltan Varga <vargaz@gmail.com>
Date: Sun, 30 Nov 2014 01:48:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'mfoliveira/ppc64el-v2'
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=mono.git;a=commitdiff_plain;h=173eaf1dfaf29d0a7170b4d467e24e38f52c589e

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

This is a merge of:

https://github.com/mono/mono/pull/1409
---

173eaf1dfaf29d0a7170b4d467e24e38f52c589e
diff --cc mono/metadata/sgen-marksweep.c
index d60f8d04567,1dfaf23d5e5..88664226b9a
--- a/mono/metadata/sgen-marksweep.c
+++ b/mono/metadata/sgen-marksweep.c
@@@ -46,8 -45,13 +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	(16*1024)
 -#define MS_BLOCK_SIZE_SHIFT	14
++#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)