From a1e4e1e29c311d995fedfe42f5bac85e127fa799 Mon Sep 17 00:00:00 2001
From: David Lovemore <dl@ravenbrook.com>
Date: Mon, 21 May 2012 17:40:07 +0100
Subject: [PATCH] Temporary fix for 64 bit windows: make allocations 8 byte
 aligned.

Copied from Perforce
 Change: 178238
 ServerID: perforce.ravenbrook.com
---
 mps/code/locv.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/mps/code/locv.c b/mps/code/locv.c
index a1975e6a43d..d8eccbb04bf 100644
--- a/mps/code/locv.c
+++ b/mps/code/locv.c
@@ -27,7 +27,7 @@ static void stepper(mps_addr_t addr, mps_fmt_t fmt, mps_pool_t pool,
 
 static mps_fmt_A_s locv_fmt =
   {
-    (mps_align_t)4,
+    (mps_align_t)8,  /* was 4 @@@@ FIXME: W3I6MV Temporary fix */
     scan,
     skip,
     copy,
@@ -61,9 +61,10 @@ int main(void)
 
   die(mps_ap_create(&ap, pool, MPS_RANK_EXACT), "APCreate");
 
-  die(mps_reserve(&p, ap, (size_t)4), "mps_reserve 4");
-  *(mps_word_t *)p = 4;
-  cdie(mps_commit(ap, p, (size_t)4), "commit 4");
+  /* was 4 @@@@ FIXME: W3I6MV Temporary fix */
+  die(mps_reserve(&p, ap, (size_t)8), "mps_reserve 4");
+  *(mps_word_t *)p = 8;
+  cdie(mps_commit(ap, p, (size_t)8), "commit 4");
   
   die(mps_reserve(&roots[1], ap, (size_t)8), "mps_reserve 8");
   p = roots[1];
@@ -74,9 +75,10 @@ int main(void)
   *(mps_word_t *)p = 4096;
   cdie(mps_commit(ap, p, (size_t)4096), "commit 4096");
   
-  die(mps_reserve(&p, ap, (size_t)4), "mps_reserve last");
-  *(mps_word_t *)p = 4;
-  cdie(mps_commit(ap, p, (size_t)4), "commit last");
+  /* was 4 @@@@ FIXME: W3I6MV Temporary fix */
+  die(mps_reserve(&p, ap, (size_t)8), "mps_reserve last");
+  *(mps_word_t *)p = 8;
+  cdie(mps_commit(ap, p, (size_t)8), "commit last");
 
   {
     size_t count = 0;