Eliminating pfmdefs from makefiles by moving them to mpstd.h so that the mps can be built with a simpler compiler command.

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

7 files changed, 33 insertions, 39 deletions

diff --git a/mps/code/comm.gmk b/mps/code/comm.gmk
index 5e606fc09b9..3e24487f3d3 100644
--- a/mps/code/comm.gmk
+++ b/mps/code/comm.gmk
@@ -89,6 +89,8 @@ endif
 # C FLAGS
 
 # These flags are included in all compilations.
+# Avoid using PFMDEFS in platform makefiles, as they prevent the MPS being
+# built with a simple command like "cc -c mps.c".
 CFLAGSCOMMON = $(PFMDEFS) $(CFLAGSCOMPILER)
 
 # %%VARIETY: Define a macro containing the set of flags for the new
diff --git a/mps/code/fri3gc.gmk b/mps/code/fri3gc.gmk
index 2a79160c1e0..f2895c00404 100644
--- a/mps/code/fri3gc.gmk
+++ b/mps/code/fri3gc.gmk
@@ -5,11 +5,6 @@
 
 PFM = fri3gc
 
-# FIXME: What is this for?  Clues at
-# http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html
-# Discover whether it's still necessary and if so, document why.
-PFMDEFS = -D_REENTRANT
-
 MPMPF = lockix.c thix.c pthrdext.c vmix.c \
         protix.c protsgix.c prmcan.c prmci3fr.c ssixi3.c span.c
 
diff --git a/mps/code/fri6gc.gmk b/mps/code/fri6gc.gmk
index de1102190e6..081e0cff43b 100644
--- a/mps/code/fri6gc.gmk
+++ b/mps/code/fri6gc.gmk
@@ -5,11 +5,6 @@
 
 PFM = fri6gc
 
-# FIXME: What is this for?  Clues at
-# http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html
-# Discover whether it's still necessary and if so, document why.
-PFMDEFS = -D_REENTRANT
-
 MPMPF = lockix.c thix.c pthrdext.c vmix.c \
         protix.c protsgix.c prmcan.c prmci6fr.c ssixi6.c span.c
 
diff --git a/mps/code/lii3gc.gmk b/mps/code/lii3gc.gmk
index 148df6fed04..58176c0571f 100644
--- a/mps/code/lii3gc.gmk
+++ b/mps/code/lii3gc.gmk
@@ -8,11 +8,6 @@ PFM = lii3gc
 THREADSRC = lockli.c thix.c pthrdext.c
 THREADLIB = -lpthread
 
-# _XOPEN_SOURCE is to get the modern POSIX signal handling
-# _GNU_SOURCE is to get register numbers in prmci3li.c
-# http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html
-PFMDEFS = -D_REENTRANT -D_XOPEN_SOURCE=500 -D_GNU_SOURCE
-
 MPMPF = ${THREADSRC} vmix.c \
         protix.c protli.c proti3.c prmci3li.c ssixi3.c span.c
 
diff --git a/mps/code/lii6gc.gmk b/mps/code/lii6gc.gmk
index 9c47b0926fb..4c48923b082 100644
--- a/mps/code/lii6gc.gmk
+++ b/mps/code/lii6gc.gmk
@@ -8,11 +8,6 @@ PFM = lii6gc
 THREADSRC = lockli.c thix.c pthrdext.c
 THREADLIB = -lpthread
 
-# _XOPEN_SOURCE is to get the modern POSIX signal handling
-# _GNU_SOURCE is to get register numbers in prmci3li.c
-# http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html
-PFMDEFS = -D_REENTRANT -D_XOPEN_SOURCE=500 -D_GNU_SOURCE
-
 MPMPF = ${THREADSRC} vmix.c \
         protix.c protli.c proti6.c prmci6li.c ssixi6.c span.c
 
diff --git a/mps/code/mps.c b/mps/code/mps.c
index 34bec8c0c42..cf967507816 100644
--- a/mps/code/mps.c
+++ b/mps/code/mps.c
@@ -18,6 +18,16 @@
  * which closely mirror those in the makefiles.
  */
 
+
+/* Platform interface
+ *
+ * This must be included first as it defines symbols which affect system
+ * headers, such as _POSIX_C_SOURCE _REENTRANT etc.
+ */
+
+#include "mpstd.h"
+
+
 /* MPM Core */
 
 #include "mpsi.c"
@@ -75,10 +85,6 @@
 #include "mpsliban.c"
 #include "mpsioan.c"
 
-/* Platform interface */
-
-#include "mpstd.h"
-
 /* Mac OS X on 32-bit Intel built with Clang or GCC */
 
 #if defined(MPS_PF_XCI3LL) || defined(MPS_PF_XCI3GC)
diff --git a/mps/code/mpstd.h b/mps/code/mpstd.h
index 10d3d2833a6..2f3f3f4d94b 100644
--- a/mps/code/mpstd.h
+++ b/mps/code/mpstd.h
@@ -127,6 +127,7 @@
 #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__) \
@@ -145,6 +146,7 @@
 #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__) \
@@ -163,6 +165,7 @@
 #define MPS_WORD_SHIFT  6
 #define MPS_PF_ALIGN    8
 
+
 /* GCC 2.6.3, gcc -E -dM
  * The actual granularity of GNU malloc is 8, but field alignments are
  * all 4.
@@ -183,6 +186,11 @@
 #define MPS_WORD_SHIFT  5
 #define MPS_PF_ALIGN    4
 
+#define _REENTRANT        /* FIXME: What for? */
+#define _XOPEN_SOURCE 500 /* to get POSIX signal handling */
+#define _GNU_SOURCE       /* to get register numbers for prmci3li.c */
+
+
 /* GCC 4.6.3, gcc -E -dM */
 
 #elif defined(__linux__) && defined(__x86_64) && defined(__GNUC__)
@@ -200,22 +208,10 @@
 #define MPS_WORD_SHIFT  6
 #define MPS_PF_ALIGN    8
 
-/* GCC 2.7.2, gcc -E -dM */
+#define _REENTRANT        /* FIXME: What for? */
+#define _XOPEN_SOURCE 500 /* to get POSIX signal handling */
+#define _GNU_SOURCE       /* to get register numbers for prmci3li.c */
 
-#elif defined(__linux__) && defined(__PPC__) && defined(__GNUC__)
-#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_LIPPGC)
-#error "specified CONFIG_PF_... inconsistent with detected lippgc"
-#endif
-#define MPS_PF_LIPPGC
-#define MPS_PF_STRING   "lippgc"
-#define MPS_OS_LI
-#define MPS_ARCH_PP
-#define MPS_BUILD_GC
-#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    8 /* @@@@ not tested */
 
 /* GCC 2.95.3, gcc -E -dM */
 
@@ -234,6 +230,11 @@
 #define MPS_WORD_SHIFT  5
 #define MPS_PF_ALIGN    4
 
+/* FIXME: What is this for?  Clues at <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
+   Discover whether it's still necessary and if so, document why. */
+#define _REENTRANT
+
+
 #elif defined(__FreeBSD__) && defined (__x86_64__) && defined (__GNUC__)
 #if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_FRI6GC)
 #error "specified CONFIG_PF_... inconsistent with detected fri6gc"
@@ -249,6 +250,11 @@
 #define MPS_WORD_SHIFT  6
 #define MPS_PF_ALIGN    8
 
+/* FIXME: What is this for?  Clues at <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
+   Discover whether it's still necessary and if so, document why. */
+#define _REENTRANT
+
+
 #else
 #error "Unable to detect target platform"
 #endif