aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2012-11-22 09:33:27 +0100
committerBjörn-Egil Dahlberg <[email protected]>2012-12-14 15:12:50 +0100
commit2eaecbf3847120978cd61479d656d2381d533134 (patch)
tree724d474ccec9cd93f6afc8f2a9c2b911714bfa97
parentf5bf29d4db2a257879641ae4fea7d6937027295c (diff)
downloadotp-2eaecbf3847120978cd61479d656d2381d533134.tar.gz
otp-2eaecbf3847120978cd61479d656d2381d533134.tar.bz2
otp-2eaecbf3847120978cd61479d656d2381d533134.zip
erts: Fix new header scheme for win64
-rw-r--r--erts/emulator/beam/erl_alloc_util.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/erts/emulator/beam/erl_alloc_util.h b/erts/emulator/beam/erl_alloc_util.h
index 18ddad5f5b..9c15547574 100644
--- a/erts/emulator/beam/erl_alloc_util.h
+++ b/erts/emulator/beam/erl_alloc_util.h
@@ -222,11 +222,14 @@ erts_aint32_t erts_alcu_fix_alloc_shrink(Allctr_t *, erts_aint32_t);
#define CARRIER_SZ_MASK UNIT_MASK
-#ifdef ARCH_64
-# define MBC_ABLK_OFFSET_BITS 24
-#elif HAVE_SUPER_ALIGNED_MB_CARRIERS
-# define MBC_ABLK_OFFSET_BITS 13
-#else
+#if HAVE_ERTS_MSEG
+# ifdef ARCH_64
+# define MBC_ABLK_OFFSET_BITS 24
+# elif HAVE_SUPER_ALIGNED_MB_CARRIERS
+# define MBC_ABLK_OFFSET_BITS 13
+# endif
+#endif
+#ifndef MBC_ABLK_OFFSET_BITS
# define MBC_ABLK_OFFSET_BITS 0 /* no carrier offset in block header */
#endif