From 55906e2b58737b92da2e84fa33cbb9921c9e43f3 Mon Sep 17 00:00:00 2001
From: Richard Brooksby <rb@ravenbrook.com>
Date: Wed, 17 Jul 2013 16:49:31 +0100
Subject: [PATCH] Fixing up build for test platform xci3gc, broken by os x
 threads development.

Enabling amcssth and awlutth tests for all platforms, since I believe these were fixed by OS X threads development.

Copied from Perforce
 Change: 183118
 ServerID: perforce.ravenbrook.com
---
 mps/code/comm.gmk   | 7 +++----
 mps/code/prmcxc.h   | 1 +
 mps/code/protxc.c   | 4 +++-
 mps/code/xci3gc.gmk | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/mps/code/comm.gmk b/mps/code/comm.gmk
index 1e8eab7176c..e0c6236ef8d 100644
--- a/mps/code/comm.gmk
+++ b/mps/code/comm.gmk
@@ -221,19 +221,18 @@ LIB_TARGETS=mps.a mpsplan.a
 # If it is suitable for running regularly (for example, after every
 # build) as an automated test case, add it to AUTO_TEST_TARGETS.
 
-AUTO_TEST_TARGETS=abqtest amcss amcsshe amsss amssshe apss      \
-    arenacv awlut awluthe btcv exposet0 expt825 fbmtest finalcv         \
+AUTO_TEST_TARGETS=abqtest amcss amcsshe amcssth amsss amssshe apss      \
+    arenacv awlut awluthe awlutth btcv exposet0 expt825 fbmtest finalcv \
     finaltest fotest lockcov locv messtest mpmss mpsicv mv2test         \
     poolncv qs sacss segsmss steptest walkt0 zmess
 
 # If it is not runnable as an automated test case, but is buildable,
 # add it to OTHER_TEST_TARGETS with a note.
 #
-# awlutth -- fails (job003506).
 # bttest and teletest -- interactive and so cannot be run unattended.
 # zcoll -- takes too long to be useful as a regularly run smoke test.
 
-OTHER_TEST_TARGETS=awlutth bttest teletest zcoll
+OTHER_TEST_TARGETS=bttest teletest zcoll
 
 # This target records programs that we were once able to build but
 # can't at the moment:
diff --git a/mps/code/prmcxc.h b/mps/code/prmcxc.h
index 1e0fdebe796..52e0515b3b4 100644
--- a/mps/code/prmcxc.h
+++ b/mps/code/prmcxc.h
@@ -11,6 +11,7 @@
 
 #include "mpm.h"
 
+#include <mach/mach_types.h>
 #include <mach/i386/thread_status.h>
 
 typedef struct MutatorFaultContextStruct { /* Protection fault context data */
diff --git a/mps/code/protxc.c b/mps/code/protxc.c
index df6505a69f9..fbd399b4878 100644
--- a/mps/code/protxc.c
+++ b/mps/code/protxc.c
@@ -239,7 +239,9 @@ static void protCatchOne(void)
   if (request.code[0] == KERN_PROTECTION_FAILURE) {
     MutatorFaultContextStruct mfcStruct;
 
-    mfcStruct.address = (Addr)request.code[1];
+    /* The cast via Word suppresses "cast to pointer from integer of
+       different size" warnings in GCC, for the  XCI3GC build. */
+    mfcStruct.address = (Addr)(Word)request.code[1];
     AVER(sizeof(*mfcStruct.threadState) == sizeof(THREAD_STATE_S));
     mfcStruct.threadState = (THREAD_STATE_S *)request.old_state;
   
diff --git a/mps/code/xci3gc.gmk b/mps/code/xci3gc.gmk
index 6dd5e3ff913..2ba7c8af121 100644
--- a/mps/code/xci3gc.gmk
+++ b/mps/code/xci3gc.gmk
@@ -9,8 +9,8 @@
 
 PFM = xci3gc
 
-MPMPF = lockix.c than.c vmix.c \
-        protix.c protsgix.c prmcan.c span.c ssixi3.c
+MPMPF = lockix.c thxc.c vmix.c protix.c proti3.c prmci3xc.c span.c ssixi3.c \
+        protxc.c
 
 LIBS =