Merge remote-tracking branch 'mfoliveira/ppc64el-v2'
authorZoltan Varga <vargaz@gmail.com>
Sun, 30 Nov 2014 01:48:38 +0000 (02:48 +0100)
committerZoltan Varga <vargaz@gmail.com>
Sun, 30 Nov 2014 01:48:38 +0000 (02:48 +0100)
This is a merge of:

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

1  2 
mono/metadata/sgen-marksweep.c
mono/mini/aot-compiler.c
mono/mini/exceptions-ppc.c
mono/mini/mini-gc.c
mono/mini/mini-ppc.h
mono/mini/mini.c

index d60f8d045672488a00a5ac8ee66fd19583c3995d,1dfaf23d5e500d64f2b89963ad3e894d389a012b..88664226b9abdcec1108362a26abe1f9a24b2525
  
  #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)
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge