Merging branch/2012-05-21/build-xci6ll -- build support for 64-bit mac os x.

Copied from Perforce
 Change: 178560
 ServerID: perforce.ravenbrook.com

1 files changed, 39 insertions, 1 deletions

diff --git a/mps/code/mpstd.h b/mps/code/mpstd.h
index b71da925752..4a8a0875ca3 100644
--- a/mps/code/mpstd.h
+++ b/mps/code/mpstd.h
@@ -285,10 +285,12 @@
 /* GCC 4.0.1 (As supplied by Apple on Mac OS X 10.4.8 on an Intel Mac),
  * gcc -E -dM
  * And above for xcppgc.
+ * Note that Clang also defines __GNUC__ since it's generally GCC compatible,
+ * but that doesn't fit our system so we exclude Clang here.
  */
 
 #elif defined(__APPLE__) && defined(__i386__) && defined(__MACH__) \
-      && defined(__GNUC__)
+      && defined(__GNUC__) && !defined(__clang__)
 #if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_XCI3GC)
 #error "specified CONFIG_PF_... inconsistent with detected xci3gc"
 #endif
@@ -303,6 +305,42 @@
 #define MPS_WORD_SHIFT  5
 #define MPS_PF_ALIGN    4       /* I'm just guessing. */
 
+/* Apple clang version 3.1, clang -E -dM */
+
+#elif defined(__APPLE__) && defined(__i386__) && defined(__MACH__) \
+      && defined(__clang__)
+#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_XCI3LL)
+#error "specified CONFIG_PF_... inconsistent with detected xci3ll"
+#endif
+#define MPS_PF_XCI3LL
+#define MPS_PF_STRING   "xci3ll"
+#define MPS_OS_XC
+#define MPS_ARCH_I3
+#define MPS_BUILD_LL
+#define MPS_T_WORD      unsigned long
+#define MPS_T_ULONGEST  unsigned long
+#define MPS_WORD_WIDTH  32
+#define MPS_WORD_SHIFT  5
+#define MPS_PF_ALIGN    4       /* I'm just guessing. */
+
+/* Apple clang version 3.1, clang -E -dM */
+
+#elif defined(__APPLE__) && defined(__x86_64__) && defined(__MACH__) \
+      && defined(__clang__)
+#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_XCI6LL)
+#error "specified CONFIG_PF_... inconsistent with detected xci6ll"
+#endif
+#define MPS_PF_XCI6LL
+#define MPS_PF_STRING   "xci6ll"
+#define MPS_OS_XC
+#define MPS_ARCH_I6
+#define MPS_BUILD_LL
+#define MPS_T_WORD      unsigned long
+#define MPS_T_ULONGEST  unsigned long
+#define MPS_WORD_WIDTH  64
+#define MPS_WORD_SHIFT  6
+#define MPS_PF_ALIGN    8
+
 /* GCC 2.5.8, gcc -E -dM, (__SVR4 indicates Solaris) */
 
 #elif defined(__sun__) && defined(__sparc__) && defined(__GNUC__) \