Merging improvements from version 1.110 branch.

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

3 files changed, 14 insertions, 1 deletions

diff --git a/mps/code/mps.xcodeproj/project.pbxproj b/mps/code/mps.xcodeproj/project.pbxproj
index 075fe7439f2..207e50660e4 100644
--- a/mps/code/mps.xcodeproj/project.pbxproj
+++ b/mps/code/mps.xcodeproj/project.pbxproj
@@ -3143,6 +3143,7 @@
                                         "-Wno-extended-offsetof",
                                 );
                                 SDKROOT = macosx;
+                                SYMROOT = xc;
                                 WARNING_CFLAGS = (
                                         "-pedantic",
                                         "-Wpointer-arith",
@@ -3508,6 +3509,7 @@
                                         "-Wno-extended-offsetof",
                                 );
                                 SDKROOT = macosx;
+                                SYMROOT = xc;
                                 WARNING_CFLAGS = (
                                         "-pedantic",
                                         "-Wpointer-arith",
@@ -3560,6 +3562,7 @@
                                         "-Wno-extended-offsetof",
                                 );
                                 SDKROOT = macosx;
+                                SYMROOT = xc;
                                 WARNING_CFLAGS = (
                                         "-pedantic",
                                         "-Wpointer-arith",
diff --git a/mps/code/mpstd.h b/mps/code/mpstd.h
index 1725639691f..0345810b723 100644
--- a/mps/code/mpstd.h
+++ b/mps/code/mpstd.h
@@ -252,7 +252,7 @@
 
 
 #else
-#error "Unable to detect target platform"
+#error "The MPS Kit does not have a configuration for this platform out of the box; see manual/build.txt"
 #endif
 
 
diff --git a/mps/code/poolamc.c b/mps/code/poolamc.c
index 15bbf4aaba4..5901c098512 100644
--- a/mps/code/poolamc.c
+++ b/mps/code/poolamc.c
@@ -943,6 +943,16 @@ static Res amcInitComm(Pool pool, RankSet rankSet, va_list arg)
   Index i;
   size_t genArraySize;
   size_t genCount;
+  
+  /* Suppress a warning about this structure not being used when there
+     are no statistics.  Note that simply making the declaration conditional
+     does not work, because we carefully reference expressions inside
+     STATISTICS to prevent such warnings on parameters and local variables.
+     It's just that clang 4.0 on Mac OS X does some sort of extra check
+     that produces a special warnings about static variables. */
+#if !defined(STATISTICS)
+  UNUSED(pageretstruct_Zero);
+#endif
 
   AVER(pool != NULL);