Added single compilation unit version of mps library to allow global optimization and universal binary building. minor fixes to other sources to avoid clashing symbols.

Separated XCI3GC (gcc) from XCI3LL (clang) platforms, so that we can build both 32- and 64-bit binaries with clang.
Enabled universal (multi architecture) builds.

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

1 files changed, 39 insertions, 19 deletions

diff --git a/mps/code/mpstd.h b/mps/code/mpstd.h
index edf7ec8d933..c53fbe31989 100644
--- a/mps/code/mpstd.h
+++ b/mps/code/mpstd.h
@@ -258,10 +258,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
@@ -276,6 +278,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__) \
@@ -440,24 +478,6 @@
 #define MPS_WORD_SHIFT  5
 #define MPS_PF_ALIGN    4
 
-/* 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
-
 #else
 #error "Unable to detect target platform"
 #endif