From e814ccfa1e2ecf5d034e5e6c1c12504f1a9cee33 Mon Sep 17 00:00:00 2001 From: Richard Kistruck Date: Mon, 20 Oct 2008 16:24:20 +0100 Subject: [PATCH 1/5] Mps br/vc9: new w3i3m9 clone-platform (not a full platform) Clone w3i3mv.nmk -> w3i3m9 Clone w3build.bat -> w3vc9.bat Copied from Perforce Change: 166500 ServerID: perforce.ravenbrook.com --- mps/code/w3i3m9.nmk | 358 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 358 insertions(+) create mode 100644 mps/code/w3i3m9.nmk diff --git a/mps/code/w3i3m9.nmk b/mps/code/w3i3m9.nmk new file mode 100644 index 00000000000..fc9509cd87b --- /dev/null +++ b/mps/code/w3i3m9.nmk @@ -0,0 +1,358 @@ +# w3i3mv.nmk: WINDOWS (INTEL) NMAKE FILE +# +# $Id$ +# Copyright (c) 2001 Ravenbrook Limited. See end of file for license. + +PFM = w3i3mv + +RAINBOWPATH = MSVISUAL\WIN32\I386 +DONGLELIB = $(RAINBOWPATH)\spromeps.lib + +# /Gs appears to be necessary to suppress stack checks. Stack checks +# (if not suppressed) generate a dependency on the C library, __chkesp, +# which causes the linker step to fail when building the DLL, mpsdy.dll. +PFMDEFS = /DWIN32 /D_WINDOWS /Gs /I$(RAINBOWPATH) + +MPM = \ + \ + \ + \ + \ + \ + \ + +SW = \ + \ + \ + \ + \ + \ + \ + \ + +PLINTH = +AMC = +AMS = +AWL = +LO = +SNC = +DW = +FMTTEST = +POOLN = +TESTLIB = + + +!INCLUDE commpre.nmk + + +# Source to object file mappings and CFLAGS amalgamation +# %%VARIETY %%PART: Add new macros which expand to the files included +# in the part for each variety +# %%VARIETY: Add a CFLAGS macro which expands to the flags that that variety +# should use when compiling C. And a LINKFLAGS macro which expands to the +# flags that the variety should use when building executables. And a LIBFLAGS +# macro which expands to the flags that the variety should use when building +# libraries + +!IF "$(VARIETY)" == "he" +CFLAGS=$(CFLAGSCOMMONPRE) $(CFHE) $(CFLAGSCOMMONPOST) +LINKFLAGS=$(LINKFLAGSCOMMON) $(LFHE) +LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSHE) +MPMOBJ0 = $(MPM:<=w3i3mv\he\) +MPMOBJ = $(MPMOBJ0:>=.obj) +PLINTHOBJ0 = $(PLINTH:<=w3i3mv\he\) +PLINTHOBJ = $(PLINTHOBJ0:>=.obj) +SWOBJ0 = $(SW:<=w3i3mv\he\) +SWOBJ = $(SWOBJ0:>=.obj) +AMSOBJ0 = $(AMS:<=w3i3mv\he\) +AMSOBJ = $(AMSOBJ0:>=.obj) +AMCOBJ0 = $(AMC:<=w3i3mv\he\) +AMCOBJ = $(AMCOBJ0:>=.obj) +AWLOBJ0 = $(AWL:<=w3i3mv\he\) +AWLOBJ = $(AWLOBJ0:>=.obj) +LOOBJ0 = $(LO:<=w3i3mv\he\) +LOOBJ = $(LOOBJ0:>=.obj) +SNCOBJ0 = $(SNC:<=w3i3mv\he\) +SNCOBJ = $(SNCOBJ0:>=.obj) +DWOBJ0 = $(DW:<=w3i3mv\he\) +DWOBJ = $(DWOBJ0:>=.obj) +FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\he\) +FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj) +POOLNOBJ0 = $(POOLN:<=w3i3mv\he\) +POOLNOBJ = $(POOLNOBJ0:>=.obj) +TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\he\) +TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj) + +!ELSEIF "$(VARIETY)" == "ce" +CFLAGS=$(CFLAGSCOMMONPRE) $(CFCE) $(CFLAGSCOMMONPOST) +LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCE) +LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSCE) +MPMOBJ0 = $(MPM:<=w3i3mv\ce\) +MPMOBJ = $(MPMOBJ0:>=.obj) +PLINTHOBJ0 = $(PLINTH:<=w3i3mv\ce\) +PLINTHOBJ = $(PLINTHOBJ0:>=.obj) +SWOBJ0 = $(SW:<=w3i3mv\ce\) +SWOBJ = $(SWOBJ0:>=.obj) +AMSOBJ0 = $(AMS:<=w3i3mv\ce\) +AMSOBJ = $(AMSOBJ0:>=.obj) +AMCOBJ0 = $(AMC:<=w3i3mv\ce\) +AMCOBJ = $(AMCOBJ0:>=.obj) +AWLOBJ0 = $(AWL:<=w3i3mv\ce\) +AWLOBJ = $(AWLOBJ0:>=.obj) +LOOBJ0 = $(LO:<=w3i3mv\ce\) +LOOBJ = $(LOOBJ0:>=.obj) +SNCOBJ0 = $(SNC:<=w3i3mv\ce\) +SNCOBJ = $(SNCOBJ0:>=.obj) +DWOBJ0 = $(DW:<=w3i3mv\ce\) +DWOBJ = $(DWOBJ0:>=.obj) +FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\ce\) +FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj) +POOLNOBJ0 = $(POOLN:<=w3i3mv\ce\) +POOLNOBJ = $(POOLNOBJ0:>=.obj) +TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\ce\) +TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj) + +!ELSEIF "$(VARIETY)" == "hi" +CFLAGS=$(CFLAGSCOMMONPRE) $(CFHI) $(CFLAGSCOMMONPOST) +LINKFLAGS=$(LINKFLAGSCOMMON) $(LFHI) +LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSHI) +MPMOBJ0 = $(MPM:<=w3i3mv\hi\) +MPMOBJ = $(MPMOBJ0:>=.obj) +PLINTHOBJ0 = $(PLINTH:<=w3i3mv\hi\) +PLINTHOBJ = $(PLINTHOBJ0:>=.obj) +SWOBJ0 = $(SW:<=w3i3mv\hi\) +SWOBJ = $(SWOBJ0:>=.obj) +AMSOBJ0 = $(AMS:<=w3i3mv\hi\) +AMSOBJ = $(AMSOBJ0:>=.obj) +AMCOBJ0 = $(AMC:<=w3i3mv\hi\) +AMCOBJ = $(AMCOBJ0:>=.obj) +AWLOBJ0 = $(AWL:<=w3i3mv\hi\) +AWLOBJ = $(AWLOBJ0:>=.obj) +LOOBJ0 = $(LO:<=w3i3mv\hi\) +LOOBJ = $(LOOBJ0:>=.obj) +SNCOBJ0 = $(SNC:<=w3i3mv\hi\) +SNCOBJ = $(SNCOBJ0:>=.obj) +DWOBJ0 = $(DW:<=w3i3mv\hi\) +DWOBJ = $(DWOBJ0:>=.obj) +FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\hi\) +FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj) +POOLNOBJ0 = $(POOLN:<=w3i3mv\hi\) +POOLNOBJ = $(POOLNOBJ0:>=.obj) +TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\hi\) +TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj) + +!ELSEIF "$(VARIETY)" == "di" +CFLAGS=$(CFLAGSCOMMONPRE) $(CFDI) $(CFLAGSCOMMONPOST) +LINKFLAGS=$(LINKFLAGSCOMMON) $(LFDI) +LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSDI) +MPMOBJ0 = $(MPM:<=w3i3mv\di\) +MPMOBJ = $(MPMOBJ0:>=.obj) +PLINTHOBJ0 = $(PLINTH:<=w3i3mv\di\) +PLINTHOBJ = $(PLINTHOBJ0:>=.obj) +SWOBJ0 = $(SW:<=w3i3mv\di\) +SWOBJ = $(SWOBJ0:>=.obj) +AMSOBJ0 = $(AMS:<=w3i3mv\di\) +AMSOBJ = $(AMSOBJ0:>=.obj) +AMCOBJ0 = $(AMC:<=w3i3mv\di\) +AMCOBJ = $(AMCOBJ0:>=.obj) +AWLOBJ0 = $(AWL:<=w3i3mv\di\) +AWLOBJ = $(AWLOBJ0:>=.obj) +LOOBJ0 = $(LO:<=w3i3mv\di\) +LOOBJ = $(LOOBJ0:>=.obj) +SNCOBJ0 = $(SNC:<=w3i3mv\di\) +SNCOBJ = $(SNCOBJ0:>=.obj) +DWOBJ0 = $(DW:<=w3i3mv\di\) +DWOBJ = $(DWOBJ0:>=.obj) +FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\di\) +FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj) +POOLNOBJ0 = $(POOLN:<=w3i3mv\di\) +POOLNOBJ = $(POOLNOBJ0:>=.obj) +TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\di\) +TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj) + +!ELSEIF "$(VARIETY)" == "ci" +CFLAGS=$(CFLAGSCOMMONPRE) $(CFCI) $(CFLAGSCOMMONPOST) +LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCI) +LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSCI) +MPMOBJ0 = $(MPM:<=w3i3mv\ci\) +MPMOBJ = $(MPMOBJ0:>=.obj) +PLINTHOBJ0 = $(PLINTH:<=w3i3mv\ci\) +PLINTHOBJ = $(PLINTHOBJ0:>=.obj) +SWOBJ0 = $(SW:<=w3i3mv\ci\) +SWOBJ = $(SWOBJ0:>=.obj) +AMSOBJ0 = $(AMS:<=w3i3mv\ci\) +AMSOBJ = $(AMSOBJ0:>=.obj) +AMCOBJ0 = $(AMC:<=w3i3mv\ci\) +AMCOBJ = $(AMCOBJ0:>=.obj) +AWLOBJ0 = $(AWL:<=w3i3mv\ci\) +AWLOBJ = $(AWLOBJ0:>=.obj) +LOOBJ0 = $(LO:<=w3i3mv\ci\) +LOOBJ = $(LOOBJ0:>=.obj) +SNCOBJ0 = $(SNC:<=w3i3mv\ci\) +SNCOBJ = $(SNCOBJ0:>=.obj) +DWOBJ0 = $(DW:<=w3i3mv\ci\) +DWOBJ = $(DWOBJ0:>=.obj) +FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\ci\) +FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj) +POOLNOBJ0 = $(POOLN:<=w3i3mv\ci\) +POOLNOBJ = $(POOLNOBJ0:>=.obj) +TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\ci\) +TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj) + +!ELSEIF "$(VARIETY)" == "ti" +CFLAGS=$(CFLAGSCOMMONPRE) $(CFTI) $(CFLAGSCOMMONPOST) +LINKFLAGS=$(LINKFLAGSCOMMON) $(LFTI) +LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSTI) +MPMOBJ0 = $(MPM:<=w3i3mv\ti\) +MPMOBJ = $(MPMOBJ0:>=.obj) +PLINTHOBJ0 = $(PLINTH:<=w3i3mv\ti\) +PLINTHOBJ = $(PLINTHOBJ0:>=.obj) +SWOBJ0 = $(SW:<=w3i3mv\ti\) +SWOBJ = $(SWOBJ0:>=.obj) +AMSOBJ0 = $(AMS:<=w3i3mv\ti\) +AMSOBJ = $(AMSOBJ0:>=.obj) +AMCOBJ0 = $(AMC:<=w3i3mv\ti\) +AMCOBJ = $(AMCOBJ0:>=.obj) +AWLOBJ0 = $(AWL:<=w3i3mv\ti\) +AWLOBJ = $(AWLOBJ0:>=.obj) +LOOBJ0 = $(LO:<=w3i3mv\ti\) +LOOBJ = $(LOOBJ0:>=.obj) +SNCOBJ0 = $(SNC:<=w3i3mv\ti\) +SNCOBJ = $(SNCOBJ0:>=.obj) +DWOBJ0 = $(DW:<=w3i3mv\ti\) +DWOBJ = $(DWOBJ0:>=.obj) +FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\ti\) +FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj) +POOLNOBJ0 = $(POOLN:<=w3i3mv\ti\) +POOLNOBJ = $(POOLNOBJ0:>=.obj) +TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\ti\) +TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj) + +!ELSEIF "$(VARIETY)" == "wi" +CFLAGS=$(CFLAGSCOMMONPRE) $(CFWI) $(CFLAGSCOMMONPOST) +LINKFLAGS=$(LINKFLAGSCOMMON) $(LFWI) +LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSWI) +MPMOBJ0 = $(MPM:<=w3i3mv\wi\) +MPMOBJ = $(MPMOBJ0:>=.obj) +PLINTHOBJ0 = $(PLINTH:<=w3i3mv\wi\) +PLINTHOBJ = $(PLINTHOBJ0:>=.obj) +SWOBJ0 = $(SW:<=w3i3mv\wi\) +SWOBJ = $(SWOBJ0:>=.obj) +AMSOBJ0 = $(AMS:<=w3i3mv\wi\) +AMSOBJ = $(AMSOBJ0:>=.obj) +AMCOBJ0 = $(AMC:<=w3i3mv\wi\) +AMCOBJ = $(AMCOBJ0:>=.obj) +AWLOBJ0 = $(AWL:<=w3i3mv\wi\) +AWLOBJ = $(AWLOBJ0:>=.obj) +LOOBJ0 = $(LO:<=w3i3mv\wi\) +LOOBJ = $(LOOBJ0:>=.obj) +SNCOBJ0 = $(SNC:<=w3i3mv\wi\) +SNCOBJ = $(SNCOBJ0:>=.obj) +DWOBJ0 = $(DW:<=w3i3mv\wi\) +DWOBJ = $(DWOBJ0:>=.obj) +FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\wi\) +FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj) +POOLNOBJ0 = $(POOLN:<=w3i3mv\wi\) +POOLNOBJ = $(POOLNOBJ0:>=.obj) +TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\wi\) +TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj) + +!ELSEIF "$(VARIETY)" == "we" +CFLAGS=$(CFLAGSCOMMONPRE) $(CFWE) $(CFLAGSCOMMONPOST) +LINKFLAGS=$(LINKFLAGSCOMMON) $(LFWE) +LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSWE) +MPMOBJ0 = $(MPM:<=w3i3mv\we\) +MPMOBJ = $(MPMOBJ0:>=.obj) +PLINTHOBJ0 = $(PLINTH:<=w3i3mv\we\) +PLINTHOBJ = $(PLINTHOBJ0:>=.obj) +SWOBJ0 = $(SW:<=w3i3mv\we\) +SWOBJ = $(SWOBJ0:>=.obj) +AMSOBJ0 = $(AMS:<=w3i3mv\we\) +AMSOBJ = $(AMSOBJ0:>=.obj) +AMCOBJ0 = $(AMC:<=w3i3mv\we\) +AMCOBJ = $(AMCOBJ0:>=.obj) +AWLOBJ0 = $(AWL:<=w3i3mv\we\) +AWLOBJ = $(AWLOBJ0:>=.obj) +LOOBJ0 = $(LO:<=w3i3mv\we\) +LOOBJ = $(LOOBJ0:>=.obj) +SNCOBJ0 = $(SNC:<=w3i3mv\we\) +SNCOBJ = $(SNCOBJ0:>=.obj) +DWOBJ0 = $(DW:<=w3i3mv\we\) +DWOBJ = $(DWOBJ0:>=.obj) +FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\we\) +FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj) +POOLNOBJ0 = $(POOLN:<=w3i3mv\we\) +POOLNOBJ = $(POOLNOBJ0:>=.obj) +TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\we\) +TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj) + +#!ELSEIF "$(VARIETY)" == "cv" +#CFLAGS=$(CFLAGSCOMMON) $(CFCV) +#LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCV) +#LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSCV) +#MPMOBJ0 = $(MPM:<=w3i3mv\cv\) +#MPMOBJ = $(MPMOBJ0:>=.obj) +#PLINTHOBJ0 = $(PLINTH:<=w3i3mv\cv\) +#PLINTHOBJ = $(PLINTHOBJ0:>=.obj) +#AMSOBJ0 = $(AMS:<=w3i3mv\cv\) +#AMSOBJ = $(AMSOBJ0:>=.obj) +#AMCOBJ0 = $(AMC:<=w3i3mv\cv\) +#AMCOBJ = $(AMCOBJ0:>=.obj) +#AWLOBJ0 = $(AWL:<=w3i3mv\cv\) +#AWLOBJ = $(AWLOBJ0:>=.obj) +#LOOBJ0 = $(LO:<=w3i3mv\cv\) +#LOOBJ = $(LOOBJ0:>=.obj) +#SNCOBJ0 = $(SNC:<=w3i3mv\cv\) +#SNCOBJ = $(SNCOBJ0:>=.obj) +#DWOBJ0 = $(DW:<=w3i3mv\cv\) +#DWOBJ = $(DWOBJ0:>=.obj) +#POOLNOBJ0 = $(POOLN:<=w3i3mv\cv\) +#POOLNOBJ = $(POOLNOBJ0:>=.obj) +#TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\cv\) +#TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj) + +!ENDIF + + +!INCLUDE commpost.nmk + + +# C. COPYRIGHT AND LICENSE +# +# Copyright (C) 2001-2002 Ravenbrook Limited . +# All rights reserved. This is an open source license. Contact +# Ravenbrook for commercial licensing options. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# 3. Redistributions in any form must be accompanied by information on how +# to obtain complete source code for this software and any accompanying +# software that uses this software. The source code must either be +# included in the distribution or be available for no more than the cost +# of distribution plus a nominal fee, and must be freely redistributable +# under reasonable conditions. For an executable file, complete source +# code means the source code for all modules it contains. It does not +# include source code for modules or files that typically accompany the +# major components of the operating system on which the executable file +# runs. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +# PURPOSE, OR NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. From 258cb4fb576adafdaaeba48dc4b072e7f4aacfcb Mon Sep 17 00:00:00 2001 From: Richard Kistruck Date: Mon, 20 Oct 2008 16:51:50 +0100 Subject: [PATCH 2/5] Mps br/vc9: new w3i3m9 clone-platform: Regular changes w3i3mv ->w3i3m9 Copied from Perforce Change: 166504 ServerID: perforce.ravenbrook.com --- mps/code/w3i3m9.nmk | 230 +++++++++++++++++++++++--------------------- 1 file changed, 121 insertions(+), 109 deletions(-) diff --git a/mps/code/w3i3m9.nmk b/mps/code/w3i3m9.nmk index fc9509cd87b..435e5703b07 100644 --- a/mps/code/w3i3m9.nmk +++ b/mps/code/w3i3m9.nmk @@ -1,9 +1,21 @@ -# w3i3mv.nmk: WINDOWS (INTEL) NMAKE FILE +# w3i3m9.nmk: WINDOWS (INTEL) NMAKE FILE -- VC9 CLONE # # $Id$ # Copyright (c) 2001 Ravenbrook Limited. See end of file for license. -PFM = w3i3mv + +# This is a clone of w3i3mv, for experimenting with compiler & linker +# options for VC9 (Visual C++ 9.0). +# Differences: +# - compiler & linker options, as set in this file; +# - built in w3i3m9 directory (ie. separate from w3i3mv); +# - MPS_PF_STRING is "w3i3m9". +# Otherwise it is the same. In particular: +# - it still defines "MPS_BUILD_MV"; +# - general MPS source is blind to the distinction. + + +PFM = w3i3m9 RAINBOWPATH = MSVISUAL\WIN32\I386 DONGLELIB = $(RAINBOWPATH)\spromeps.lib @@ -58,257 +70,257 @@ TESTLIB = CFLAGS=$(CFLAGSCOMMONPRE) $(CFHE) $(CFLAGSCOMMONPOST) LINKFLAGS=$(LINKFLAGSCOMMON) $(LFHE) LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSHE) -MPMOBJ0 = $(MPM:<=w3i3mv\he\) +MPMOBJ0 = $(MPM:<=w3i3m9\he\) MPMOBJ = $(MPMOBJ0:>=.obj) -PLINTHOBJ0 = $(PLINTH:<=w3i3mv\he\) +PLINTHOBJ0 = $(PLINTH:<=w3i3m9\he\) PLINTHOBJ = $(PLINTHOBJ0:>=.obj) -SWOBJ0 = $(SW:<=w3i3mv\he\) +SWOBJ0 = $(SW:<=w3i3m9\he\) SWOBJ = $(SWOBJ0:>=.obj) -AMSOBJ0 = $(AMS:<=w3i3mv\he\) +AMSOBJ0 = $(AMS:<=w3i3m9\he\) AMSOBJ = $(AMSOBJ0:>=.obj) -AMCOBJ0 = $(AMC:<=w3i3mv\he\) +AMCOBJ0 = $(AMC:<=w3i3m9\he\) AMCOBJ = $(AMCOBJ0:>=.obj) -AWLOBJ0 = $(AWL:<=w3i3mv\he\) +AWLOBJ0 = $(AWL:<=w3i3m9\he\) AWLOBJ = $(AWLOBJ0:>=.obj) -LOOBJ0 = $(LO:<=w3i3mv\he\) +LOOBJ0 = $(LO:<=w3i3m9\he\) LOOBJ = $(LOOBJ0:>=.obj) -SNCOBJ0 = $(SNC:<=w3i3mv\he\) +SNCOBJ0 = $(SNC:<=w3i3m9\he\) SNCOBJ = $(SNCOBJ0:>=.obj) -DWOBJ0 = $(DW:<=w3i3mv\he\) +DWOBJ0 = $(DW:<=w3i3m9\he\) DWOBJ = $(DWOBJ0:>=.obj) -FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\he\) +FMTTESTOBJ0 = $(FMTTEST:<=w3i3m9\he\) FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj) -POOLNOBJ0 = $(POOLN:<=w3i3mv\he\) +POOLNOBJ0 = $(POOLN:<=w3i3m9\he\) POOLNOBJ = $(POOLNOBJ0:>=.obj) -TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\he\) +TESTLIBOBJ0 = $(TESTLIB:<=w3i3m9\he\) TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj) !ELSEIF "$(VARIETY)" == "ce" CFLAGS=$(CFLAGSCOMMONPRE) $(CFCE) $(CFLAGSCOMMONPOST) LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCE) LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSCE) -MPMOBJ0 = $(MPM:<=w3i3mv\ce\) +MPMOBJ0 = $(MPM:<=w3i3m9\ce\) MPMOBJ = $(MPMOBJ0:>=.obj) -PLINTHOBJ0 = $(PLINTH:<=w3i3mv\ce\) +PLINTHOBJ0 = $(PLINTH:<=w3i3m9\ce\) PLINTHOBJ = $(PLINTHOBJ0:>=.obj) -SWOBJ0 = $(SW:<=w3i3mv\ce\) +SWOBJ0 = $(SW:<=w3i3m9\ce\) SWOBJ = $(SWOBJ0:>=.obj) -AMSOBJ0 = $(AMS:<=w3i3mv\ce\) +AMSOBJ0 = $(AMS:<=w3i3m9\ce\) AMSOBJ = $(AMSOBJ0:>=.obj) -AMCOBJ0 = $(AMC:<=w3i3mv\ce\) +AMCOBJ0 = $(AMC:<=w3i3m9\ce\) AMCOBJ = $(AMCOBJ0:>=.obj) -AWLOBJ0 = $(AWL:<=w3i3mv\ce\) +AWLOBJ0 = $(AWL:<=w3i3m9\ce\) AWLOBJ = $(AWLOBJ0:>=.obj) -LOOBJ0 = $(LO:<=w3i3mv\ce\) +LOOBJ0 = $(LO:<=w3i3m9\ce\) LOOBJ = $(LOOBJ0:>=.obj) -SNCOBJ0 = $(SNC:<=w3i3mv\ce\) +SNCOBJ0 = $(SNC:<=w3i3m9\ce\) SNCOBJ = $(SNCOBJ0:>=.obj) -DWOBJ0 = $(DW:<=w3i3mv\ce\) +DWOBJ0 = $(DW:<=w3i3m9\ce\) DWOBJ = $(DWOBJ0:>=.obj) -FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\ce\) +FMTTESTOBJ0 = $(FMTTEST:<=w3i3m9\ce\) FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj) -POOLNOBJ0 = $(POOLN:<=w3i3mv\ce\) +POOLNOBJ0 = $(POOLN:<=w3i3m9\ce\) POOLNOBJ = $(POOLNOBJ0:>=.obj) -TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\ce\) +TESTLIBOBJ0 = $(TESTLIB:<=w3i3m9\ce\) TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj) !ELSEIF "$(VARIETY)" == "hi" CFLAGS=$(CFLAGSCOMMONPRE) $(CFHI) $(CFLAGSCOMMONPOST) LINKFLAGS=$(LINKFLAGSCOMMON) $(LFHI) LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSHI) -MPMOBJ0 = $(MPM:<=w3i3mv\hi\) +MPMOBJ0 = $(MPM:<=w3i3m9\hi\) MPMOBJ = $(MPMOBJ0:>=.obj) -PLINTHOBJ0 = $(PLINTH:<=w3i3mv\hi\) +PLINTHOBJ0 = $(PLINTH:<=w3i3m9\hi\) PLINTHOBJ = $(PLINTHOBJ0:>=.obj) -SWOBJ0 = $(SW:<=w3i3mv\hi\) +SWOBJ0 = $(SW:<=w3i3m9\hi\) SWOBJ = $(SWOBJ0:>=.obj) -AMSOBJ0 = $(AMS:<=w3i3mv\hi\) +AMSOBJ0 = $(AMS:<=w3i3m9\hi\) AMSOBJ = $(AMSOBJ0:>=.obj) -AMCOBJ0 = $(AMC:<=w3i3mv\hi\) +AMCOBJ0 = $(AMC:<=w3i3m9\hi\) AMCOBJ = $(AMCOBJ0:>=.obj) -AWLOBJ0 = $(AWL:<=w3i3mv\hi\) +AWLOBJ0 = $(AWL:<=w3i3m9\hi\) AWLOBJ = $(AWLOBJ0:>=.obj) -LOOBJ0 = $(LO:<=w3i3mv\hi\) +LOOBJ0 = $(LO:<=w3i3m9\hi\) LOOBJ = $(LOOBJ0:>=.obj) -SNCOBJ0 = $(SNC:<=w3i3mv\hi\) +SNCOBJ0 = $(SNC:<=w3i3m9\hi\) SNCOBJ = $(SNCOBJ0:>=.obj) -DWOBJ0 = $(DW:<=w3i3mv\hi\) +DWOBJ0 = $(DW:<=w3i3m9\hi\) DWOBJ = $(DWOBJ0:>=.obj) -FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\hi\) +FMTTESTOBJ0 = $(FMTTEST:<=w3i3m9\hi\) FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj) -POOLNOBJ0 = $(POOLN:<=w3i3mv\hi\) +POOLNOBJ0 = $(POOLN:<=w3i3m9\hi\) POOLNOBJ = $(POOLNOBJ0:>=.obj) -TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\hi\) +TESTLIBOBJ0 = $(TESTLIB:<=w3i3m9\hi\) TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj) !ELSEIF "$(VARIETY)" == "di" CFLAGS=$(CFLAGSCOMMONPRE) $(CFDI) $(CFLAGSCOMMONPOST) LINKFLAGS=$(LINKFLAGSCOMMON) $(LFDI) LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSDI) -MPMOBJ0 = $(MPM:<=w3i3mv\di\) +MPMOBJ0 = $(MPM:<=w3i3m9\di\) MPMOBJ = $(MPMOBJ0:>=.obj) -PLINTHOBJ0 = $(PLINTH:<=w3i3mv\di\) +PLINTHOBJ0 = $(PLINTH:<=w3i3m9\di\) PLINTHOBJ = $(PLINTHOBJ0:>=.obj) -SWOBJ0 = $(SW:<=w3i3mv\di\) +SWOBJ0 = $(SW:<=w3i3m9\di\) SWOBJ = $(SWOBJ0:>=.obj) -AMSOBJ0 = $(AMS:<=w3i3mv\di\) +AMSOBJ0 = $(AMS:<=w3i3m9\di\) AMSOBJ = $(AMSOBJ0:>=.obj) -AMCOBJ0 = $(AMC:<=w3i3mv\di\) +AMCOBJ0 = $(AMC:<=w3i3m9\di\) AMCOBJ = $(AMCOBJ0:>=.obj) -AWLOBJ0 = $(AWL:<=w3i3mv\di\) +AWLOBJ0 = $(AWL:<=w3i3m9\di\) AWLOBJ = $(AWLOBJ0:>=.obj) -LOOBJ0 = $(LO:<=w3i3mv\di\) +LOOBJ0 = $(LO:<=w3i3m9\di\) LOOBJ = $(LOOBJ0:>=.obj) -SNCOBJ0 = $(SNC:<=w3i3mv\di\) +SNCOBJ0 = $(SNC:<=w3i3m9\di\) SNCOBJ = $(SNCOBJ0:>=.obj) -DWOBJ0 = $(DW:<=w3i3mv\di\) +DWOBJ0 = $(DW:<=w3i3m9\di\) DWOBJ = $(DWOBJ0:>=.obj) -FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\di\) +FMTTESTOBJ0 = $(FMTTEST:<=w3i3m9\di\) FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj) -POOLNOBJ0 = $(POOLN:<=w3i3mv\di\) +POOLNOBJ0 = $(POOLN:<=w3i3m9\di\) POOLNOBJ = $(POOLNOBJ0:>=.obj) -TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\di\) +TESTLIBOBJ0 = $(TESTLIB:<=w3i3m9\di\) TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj) !ELSEIF "$(VARIETY)" == "ci" CFLAGS=$(CFLAGSCOMMONPRE) $(CFCI) $(CFLAGSCOMMONPOST) LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCI) LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSCI) -MPMOBJ0 = $(MPM:<=w3i3mv\ci\) +MPMOBJ0 = $(MPM:<=w3i3m9\ci\) MPMOBJ = $(MPMOBJ0:>=.obj) -PLINTHOBJ0 = $(PLINTH:<=w3i3mv\ci\) +PLINTHOBJ0 = $(PLINTH:<=w3i3m9\ci\) PLINTHOBJ = $(PLINTHOBJ0:>=.obj) -SWOBJ0 = $(SW:<=w3i3mv\ci\) +SWOBJ0 = $(SW:<=w3i3m9\ci\) SWOBJ = $(SWOBJ0:>=.obj) -AMSOBJ0 = $(AMS:<=w3i3mv\ci\) +AMSOBJ0 = $(AMS:<=w3i3m9\ci\) AMSOBJ = $(AMSOBJ0:>=.obj) -AMCOBJ0 = $(AMC:<=w3i3mv\ci\) +AMCOBJ0 = $(AMC:<=w3i3m9\ci\) AMCOBJ = $(AMCOBJ0:>=.obj) -AWLOBJ0 = $(AWL:<=w3i3mv\ci\) +AWLOBJ0 = $(AWL:<=w3i3m9\ci\) AWLOBJ = $(AWLOBJ0:>=.obj) -LOOBJ0 = $(LO:<=w3i3mv\ci\) +LOOBJ0 = $(LO:<=w3i3m9\ci\) LOOBJ = $(LOOBJ0:>=.obj) -SNCOBJ0 = $(SNC:<=w3i3mv\ci\) +SNCOBJ0 = $(SNC:<=w3i3m9\ci\) SNCOBJ = $(SNCOBJ0:>=.obj) -DWOBJ0 = $(DW:<=w3i3mv\ci\) +DWOBJ0 = $(DW:<=w3i3m9\ci\) DWOBJ = $(DWOBJ0:>=.obj) -FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\ci\) +FMTTESTOBJ0 = $(FMTTEST:<=w3i3m9\ci\) FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj) -POOLNOBJ0 = $(POOLN:<=w3i3mv\ci\) +POOLNOBJ0 = $(POOLN:<=w3i3m9\ci\) POOLNOBJ = $(POOLNOBJ0:>=.obj) -TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\ci\) +TESTLIBOBJ0 = $(TESTLIB:<=w3i3m9\ci\) TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj) !ELSEIF "$(VARIETY)" == "ti" CFLAGS=$(CFLAGSCOMMONPRE) $(CFTI) $(CFLAGSCOMMONPOST) LINKFLAGS=$(LINKFLAGSCOMMON) $(LFTI) LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSTI) -MPMOBJ0 = $(MPM:<=w3i3mv\ti\) +MPMOBJ0 = $(MPM:<=w3i3m9\ti\) MPMOBJ = $(MPMOBJ0:>=.obj) -PLINTHOBJ0 = $(PLINTH:<=w3i3mv\ti\) +PLINTHOBJ0 = $(PLINTH:<=w3i3m9\ti\) PLINTHOBJ = $(PLINTHOBJ0:>=.obj) -SWOBJ0 = $(SW:<=w3i3mv\ti\) +SWOBJ0 = $(SW:<=w3i3m9\ti\) SWOBJ = $(SWOBJ0:>=.obj) -AMSOBJ0 = $(AMS:<=w3i3mv\ti\) +AMSOBJ0 = $(AMS:<=w3i3m9\ti\) AMSOBJ = $(AMSOBJ0:>=.obj) -AMCOBJ0 = $(AMC:<=w3i3mv\ti\) +AMCOBJ0 = $(AMC:<=w3i3m9\ti\) AMCOBJ = $(AMCOBJ0:>=.obj) -AWLOBJ0 = $(AWL:<=w3i3mv\ti\) +AWLOBJ0 = $(AWL:<=w3i3m9\ti\) AWLOBJ = $(AWLOBJ0:>=.obj) -LOOBJ0 = $(LO:<=w3i3mv\ti\) +LOOBJ0 = $(LO:<=w3i3m9\ti\) LOOBJ = $(LOOBJ0:>=.obj) -SNCOBJ0 = $(SNC:<=w3i3mv\ti\) +SNCOBJ0 = $(SNC:<=w3i3m9\ti\) SNCOBJ = $(SNCOBJ0:>=.obj) -DWOBJ0 = $(DW:<=w3i3mv\ti\) +DWOBJ0 = $(DW:<=w3i3m9\ti\) DWOBJ = $(DWOBJ0:>=.obj) -FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\ti\) +FMTTESTOBJ0 = $(FMTTEST:<=w3i3m9\ti\) FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj) -POOLNOBJ0 = $(POOLN:<=w3i3mv\ti\) +POOLNOBJ0 = $(POOLN:<=w3i3m9\ti\) POOLNOBJ = $(POOLNOBJ0:>=.obj) -TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\ti\) +TESTLIBOBJ0 = $(TESTLIB:<=w3i3m9\ti\) TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj) !ELSEIF "$(VARIETY)" == "wi" CFLAGS=$(CFLAGSCOMMONPRE) $(CFWI) $(CFLAGSCOMMONPOST) LINKFLAGS=$(LINKFLAGSCOMMON) $(LFWI) LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSWI) -MPMOBJ0 = $(MPM:<=w3i3mv\wi\) +MPMOBJ0 = $(MPM:<=w3i3m9\wi\) MPMOBJ = $(MPMOBJ0:>=.obj) -PLINTHOBJ0 = $(PLINTH:<=w3i3mv\wi\) +PLINTHOBJ0 = $(PLINTH:<=w3i3m9\wi\) PLINTHOBJ = $(PLINTHOBJ0:>=.obj) -SWOBJ0 = $(SW:<=w3i3mv\wi\) +SWOBJ0 = $(SW:<=w3i3m9\wi\) SWOBJ = $(SWOBJ0:>=.obj) -AMSOBJ0 = $(AMS:<=w3i3mv\wi\) +AMSOBJ0 = $(AMS:<=w3i3m9\wi\) AMSOBJ = $(AMSOBJ0:>=.obj) -AMCOBJ0 = $(AMC:<=w3i3mv\wi\) +AMCOBJ0 = $(AMC:<=w3i3m9\wi\) AMCOBJ = $(AMCOBJ0:>=.obj) -AWLOBJ0 = $(AWL:<=w3i3mv\wi\) +AWLOBJ0 = $(AWL:<=w3i3m9\wi\) AWLOBJ = $(AWLOBJ0:>=.obj) -LOOBJ0 = $(LO:<=w3i3mv\wi\) +LOOBJ0 = $(LO:<=w3i3m9\wi\) LOOBJ = $(LOOBJ0:>=.obj) -SNCOBJ0 = $(SNC:<=w3i3mv\wi\) +SNCOBJ0 = $(SNC:<=w3i3m9\wi\) SNCOBJ = $(SNCOBJ0:>=.obj) -DWOBJ0 = $(DW:<=w3i3mv\wi\) +DWOBJ0 = $(DW:<=w3i3m9\wi\) DWOBJ = $(DWOBJ0:>=.obj) -FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\wi\) +FMTTESTOBJ0 = $(FMTTEST:<=w3i3m9\wi\) FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj) -POOLNOBJ0 = $(POOLN:<=w3i3mv\wi\) +POOLNOBJ0 = $(POOLN:<=w3i3m9\wi\) POOLNOBJ = $(POOLNOBJ0:>=.obj) -TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\wi\) +TESTLIBOBJ0 = $(TESTLIB:<=w3i3m9\wi\) TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj) !ELSEIF "$(VARIETY)" == "we" CFLAGS=$(CFLAGSCOMMONPRE) $(CFWE) $(CFLAGSCOMMONPOST) LINKFLAGS=$(LINKFLAGSCOMMON) $(LFWE) LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSWE) -MPMOBJ0 = $(MPM:<=w3i3mv\we\) +MPMOBJ0 = $(MPM:<=w3i3m9\we\) MPMOBJ = $(MPMOBJ0:>=.obj) -PLINTHOBJ0 = $(PLINTH:<=w3i3mv\we\) +PLINTHOBJ0 = $(PLINTH:<=w3i3m9\we\) PLINTHOBJ = $(PLINTHOBJ0:>=.obj) -SWOBJ0 = $(SW:<=w3i3mv\we\) +SWOBJ0 = $(SW:<=w3i3m9\we\) SWOBJ = $(SWOBJ0:>=.obj) -AMSOBJ0 = $(AMS:<=w3i3mv\we\) +AMSOBJ0 = $(AMS:<=w3i3m9\we\) AMSOBJ = $(AMSOBJ0:>=.obj) -AMCOBJ0 = $(AMC:<=w3i3mv\we\) +AMCOBJ0 = $(AMC:<=w3i3m9\we\) AMCOBJ = $(AMCOBJ0:>=.obj) -AWLOBJ0 = $(AWL:<=w3i3mv\we\) +AWLOBJ0 = $(AWL:<=w3i3m9\we\) AWLOBJ = $(AWLOBJ0:>=.obj) -LOOBJ0 = $(LO:<=w3i3mv\we\) +LOOBJ0 = $(LO:<=w3i3m9\we\) LOOBJ = $(LOOBJ0:>=.obj) -SNCOBJ0 = $(SNC:<=w3i3mv\we\) +SNCOBJ0 = $(SNC:<=w3i3m9\we\) SNCOBJ = $(SNCOBJ0:>=.obj) -DWOBJ0 = $(DW:<=w3i3mv\we\) +DWOBJ0 = $(DW:<=w3i3m9\we\) DWOBJ = $(DWOBJ0:>=.obj) -FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\we\) +FMTTESTOBJ0 = $(FMTTEST:<=w3i3m9\we\) FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj) -POOLNOBJ0 = $(POOLN:<=w3i3mv\we\) +POOLNOBJ0 = $(POOLN:<=w3i3m9\we\) POOLNOBJ = $(POOLNOBJ0:>=.obj) -TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\we\) +TESTLIBOBJ0 = $(TESTLIB:<=w3i3m9\we\) TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj) #!ELSEIF "$(VARIETY)" == "cv" #CFLAGS=$(CFLAGSCOMMON) $(CFCV) #LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCV) #LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSCV) -#MPMOBJ0 = $(MPM:<=w3i3mv\cv\) +#MPMOBJ0 = $(MPM:<=w3i3m9\cv\) #MPMOBJ = $(MPMOBJ0:>=.obj) -#PLINTHOBJ0 = $(PLINTH:<=w3i3mv\cv\) +#PLINTHOBJ0 = $(PLINTH:<=w3i3m9\cv\) #PLINTHOBJ = $(PLINTHOBJ0:>=.obj) -#AMSOBJ0 = $(AMS:<=w3i3mv\cv\) +#AMSOBJ0 = $(AMS:<=w3i3m9\cv\) #AMSOBJ = $(AMSOBJ0:>=.obj) -#AMCOBJ0 = $(AMC:<=w3i3mv\cv\) +#AMCOBJ0 = $(AMC:<=w3i3m9\cv\) #AMCOBJ = $(AMCOBJ0:>=.obj) -#AWLOBJ0 = $(AWL:<=w3i3mv\cv\) +#AWLOBJ0 = $(AWL:<=w3i3m9\cv\) #AWLOBJ = $(AWLOBJ0:>=.obj) -#LOOBJ0 = $(LO:<=w3i3mv\cv\) +#LOOBJ0 = $(LO:<=w3i3m9\cv\) #LOOBJ = $(LOOBJ0:>=.obj) -#SNCOBJ0 = $(SNC:<=w3i3mv\cv\) +#SNCOBJ0 = $(SNC:<=w3i3m9\cv\) #SNCOBJ = $(SNCOBJ0:>=.obj) -#DWOBJ0 = $(DW:<=w3i3mv\cv\) +#DWOBJ0 = $(DW:<=w3i3m9\cv\) #DWOBJ = $(DWOBJ0:>=.obj) -#POOLNOBJ0 = $(POOLN:<=w3i3mv\cv\) +#POOLNOBJ0 = $(POOLN:<=w3i3m9\cv\) #POOLNOBJ = $(POOLNOBJ0:>=.obj) -#TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\cv\) +#TESTLIBOBJ0 = $(TESTLIB:<=w3i3m9\cv\) #TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj) !ENDIF @@ -319,7 +331,7 @@ TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj) # C. COPYRIGHT AND LICENSE # -# Copyright (C) 2001-2002 Ravenbrook Limited . +# Copyright (C) 2001-2002, 2008 Ravenbrook Limited . # All rights reserved. This is an open source license. Contact # Ravenbrook for commercial licensing options. # From f6d0d07c6655ac6994930ef89fb77c1099cb5e9d Mon Sep 17 00:00:00 2001 From: Richard Kistruck Date: Mon, 20 Oct 2008 17:31:57 +0100 Subject: [PATCH 3/5] Mps br/vc9: new w3i3m9 clone-platform: - w3i3m9.nmk: use commpre9.nmk (not commpre.nmk), for VC9 compiler and linker options; - w3i3m[v9].nmk: declare CONFIG_PF_... - mpstd.h: if CONFIG_PF_... is declared, check that the correct compiler really is in use. Copied from Perforce Change: 166505 ServerID: perforce.ravenbrook.com --- mps/code/mpstd.h | 25 +++++++++++++++++++++++++ mps/code/w3i3m9.nmk | 4 ++-- mps/code/w3i3mv.nmk | 2 +- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/mps/code/mpstd.h b/mps/code/mpstd.h index 152bf819206..005c8b69d56 100644 --- a/mps/code/mpstd.h +++ b/mps/code/mpstd.h @@ -81,6 +81,26 @@ #define MPS_WORD_SHIFT 5 #define MPS_PF_ALIGN 4 +/* w3i3m9 clone-platform, differs from w3i3mv only in MPS_PF_STRING + * and compiler options. + */ + +#elif defined(CONFIG_PF_W3I3M9) \ + || defined(_MSC_VER) && (_MSC_VER >= 1500) && defined(_WIN32) && defined(_M_IX86) +#if defined(CONFIG_PF_W3I3M9) \ + && ! ( defined(_MSC_VER) && (_MSC_VER >= 1500) && defined(_WIN32) && defined(_M_IX86) ) +#error "CONFIG_PF_W3I3M9 inconsistent with target platform detected" +#endif +#define MPS_PF_W3I3MV +#define MPS_PF_STRING "w3i3m9" +#define MPS_OS_W3 +#define MPS_ARCH_I3 +#define MPS_BUILD_MV +#define MPS_T_WORD unsigned long +#define MPS_WORD_WIDTH 32 +#define MPS_WORD_SHIFT 5 +#define MPS_PF_ALIGN 8 + /* Visual C++ 2.0, Books Online, C/C++ Book, Preprocessor Reference, * Chapter 1: The Preprocessor, Macros, Predefined Macros. * Alignment of 4 would work, but the MS library uses 8 bytes for @@ -90,6 +110,11 @@ #elif defined(CONFIG_PF_W3I3MV) \ || defined(_MSC_VER) && defined(_WIN32) && defined(_M_IX86) +#if defined(CONFIG_PF_W3I3MV) \ + && ! ( defined(_MSC_VER) && (_MSC_VER < 1500) && defined(_WIN32) && defined(_M_IX86) ) +#error "CONFIG_PF_W3I3MV inconsistent with target platform detected" +/* (See w3i3m9 clone-platform, above) */ +#endif #define MPS_PF_W3I3MV #define MPS_PF_STRING "w3i3mv" #define MPS_OS_W3 diff --git a/mps/code/w3i3m9.nmk b/mps/code/w3i3m9.nmk index 435e5703b07..852b640f0ad 100644 --- a/mps/code/w3i3m9.nmk +++ b/mps/code/w3i3m9.nmk @@ -23,7 +23,7 @@ DONGLELIB = $(RAINBOWPATH)\spromeps.lib # /Gs appears to be necessary to suppress stack checks. Stack checks # (if not suppressed) generate a dependency on the C library, __chkesp, # which causes the linker step to fail when building the DLL, mpsdy.dll. -PFMDEFS = /DWIN32 /D_WINDOWS /Gs /I$(RAINBOWPATH) +PFMDEFS = /DCONFIG_PF_W3I3M9 /DWIN32 /D_WINDOWS /Gs /I$(RAINBOWPATH) MPM = \ \ @@ -54,7 +54,7 @@ POOLN = TESTLIB = -!INCLUDE commpre.nmk +!INCLUDE commpre9.nmk # Source to object file mappings and CFLAGS amalgamation diff --git a/mps/code/w3i3mv.nmk b/mps/code/w3i3mv.nmk index fc9509cd87b..daac11abd89 100644 --- a/mps/code/w3i3mv.nmk +++ b/mps/code/w3i3mv.nmk @@ -11,7 +11,7 @@ DONGLELIB = $(RAINBOWPATH)\spromeps.lib # /Gs appears to be necessary to suppress stack checks. Stack checks # (if not suppressed) generate a dependency on the C library, __chkesp, # which causes the linker step to fail when building the DLL, mpsdy.dll. -PFMDEFS = /DWIN32 /D_WINDOWS /Gs /I$(RAINBOWPATH) +PFMDEFS = /DCONFIG_PF_W3I3MV /DWIN32 /D_WINDOWS /Gs /I$(RAINBOWPATH) MPM = \ \ From 0300ffec3cd6e4ec21fd933a8a42e3fd47ebe0af Mon Sep 17 00:00:00 2001 From: Richard Kistruck Date: Tue, 21 Oct 2008 17:44:17 +0100 Subject: [PATCH 4/5] Mps br/vc9: mpstd.h: - fix broken behaviour if CONFIG_PF_* is set (result depends on order of the various platform elifs!); change it to always use platform detection by looking at preprocessor symbols, and then (if CONFIG_PF_STRING *and* CONFIG_PF_* are set) check that CONFIG and detection match; - write design notes about interaction of CONFIG_PF_* and platform detection. w3i3m[v9].nmk: define both CONFIG_PF_STRING and CONFIG_PF_*. Copied from Perforce Change: 166512 ServerID: perforce.ravenbrook.com --- mps/code/mpstd.h | 55 ++++++++++++++++++++++++++++++++++++--------- mps/code/w3i3m9.nmk | 3 ++- mps/code/w3i3mv.nmk | 3 ++- 3 files changed, 48 insertions(+), 13 deletions(-) diff --git a/mps/code/mpstd.h b/mps/code/mpstd.h index 005c8b69d56..e8da6a0c904 100644 --- a/mps/code/mpstd.h +++ b/mps/code/mpstd.h @@ -16,6 +16,44 @@ #ifndef mpstd_h #define mpstd_h +/* DESIGN NOTES + * ------------ + * [These should be moved to a proper buildsys design doc. RHSK] + * + * mpstd.h does two main things: + * 1. platform detection by looking at preprocessor symbols; + * 2. setting variables (eg. MPS_PF_STRING, MPS_WORD_WIDTH). + * + * Sometimes the platform is *already* known by the buildsystem: + * - the Global Graphics buildsystem always sets CONFIG_PF_*. + * - the Ravenbrook buildsystem knows the platform and may (but + * typically does not) set CONFIG_PF_*. + * + * Regardless of this, mpstd.h still attempts to detect the platform. + * (This is intentional). However if both CONFIG_PF_* and + * CONFIG_PF_STRING are set, then mpstd.h performs a third function: + * 3. checking that the detected platform corresponds to that + * specified by CONFIG_PF_*. + * + * Sometimes no MPS buildsystem is in use, so the platform *must* + * be detected. For example, when client software #includes mps.h, + * we want it to just work out of the box with whatever compiler is + * being used. In other words we do not require the client to define + * CONFIG_PF_*. + * (This is the case that justifes mpstd.h doing platform detection + * by looking at preprocessor symbols; otherwise we'd simply use + * CONFIG_PF_*). + * + * mpstd.h fails if it cannot detect the platform (even if CONFIG_PF_* + * is specified). This is intentional. mpstd.h does *not* allow + * CONFIG_PF_* to override the platform as detected from preprocessor + * symbols. This is intentional. + * + * References: + * GG buildsys use of CONFIG_PF_*: + * + */ + /* Irix 5/6 man cc and man abi. We can't check for _ABIO32 (see * os.i5), as we have to support Irix 5.2, which doesn't define it. We @@ -85,11 +123,9 @@ * and compiler options. */ -#elif defined(CONFIG_PF_W3I3M9) \ - || defined(_MSC_VER) && (_MSC_VER >= 1500) && defined(_WIN32) && defined(_M_IX86) -#if defined(CONFIG_PF_W3I3M9) \ - && ! ( defined(_MSC_VER) && (_MSC_VER >= 1500) && defined(_WIN32) && defined(_M_IX86) ) -#error "CONFIG_PF_W3I3M9 inconsistent with target platform detected" +#elif defined(_MSC_VER) && (_MSC_VER >= 1500) && defined(_WIN32) && defined(_M_IX86) +#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_W3I3M9) +#error "specified CONFIG_PF_... inconsistent with detected w3i3m9" #endif #define MPS_PF_W3I3MV #define MPS_PF_STRING "w3i3m9" @@ -108,12 +144,9 @@ * VC malloc is 16! */ -#elif defined(CONFIG_PF_W3I3MV) \ - || defined(_MSC_VER) && defined(_WIN32) && defined(_M_IX86) -#if defined(CONFIG_PF_W3I3MV) \ - && ! ( defined(_MSC_VER) && (_MSC_VER < 1500) && defined(_WIN32) && defined(_M_IX86) ) -#error "CONFIG_PF_W3I3MV inconsistent with target platform detected" -/* (See w3i3m9 clone-platform, above) */ +#elif defined(_MSC_VER) && defined(_WIN32) && defined(_M_IX86) +#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_W3I3MV) +#error "specified CONFIG_PF_... inconsistent with detected w3i3mv" #endif #define MPS_PF_W3I3MV #define MPS_PF_STRING "w3i3mv" diff --git a/mps/code/w3i3m9.nmk b/mps/code/w3i3m9.nmk index 852b640f0ad..f1ea0c0f557 100644 --- a/mps/code/w3i3m9.nmk +++ b/mps/code/w3i3m9.nmk @@ -23,7 +23,8 @@ DONGLELIB = $(RAINBOWPATH)\spromeps.lib # /Gs appears to be necessary to suppress stack checks. Stack checks # (if not suppressed) generate a dependency on the C library, __chkesp, # which causes the linker step to fail when building the DLL, mpsdy.dll. -PFMDEFS = /DCONFIG_PF_W3I3M9 /DWIN32 /D_WINDOWS /Gs /I$(RAINBOWPATH) +PFMDEFS = /DCONFIG_PF_STRING="w3i3m9" /DCONFIG_PF_W3I3M9 \ + /DWIN32 /D_WINDOWS /Gs /I$(RAINBOWPATH) MPM = \ \ diff --git a/mps/code/w3i3mv.nmk b/mps/code/w3i3mv.nmk index daac11abd89..9c3e6cee6b5 100644 --- a/mps/code/w3i3mv.nmk +++ b/mps/code/w3i3mv.nmk @@ -11,7 +11,8 @@ DONGLELIB = $(RAINBOWPATH)\spromeps.lib # /Gs appears to be necessary to suppress stack checks. Stack checks # (if not suppressed) generate a dependency on the C library, __chkesp, # which causes the linker step to fail when building the DLL, mpsdy.dll. -PFMDEFS = /DCONFIG_PF_W3I3MV /DWIN32 /D_WINDOWS /Gs /I$(RAINBOWPATH) +PFMDEFS = /DCONFIG_PF_STRING="w3i3mv" /DCONFIG_PF_W3I3MV \ + /DWIN32 /D_WINDOWS /Gs /I$(RAINBOWPATH) MPM = \ \ From 4c5e2167f7d95c6605345b6a0ec77667825afeb8 Mon Sep 17 00:00:00 2001 From: Richard Kistruck Date: Tue, 21 Oct 2008 18:32:26 +0100 Subject: [PATCH 5/5] Mps br/vc9: mpstd.h: (for all remaining platforms) - fix broken behaviour if CONFIG_PF_* is set (result depends on order of the various platform elifs!); change it to always use platform detection by looking at preprocessor symbols, and then (if CONFIG_PF_STRING *and* CONFIG_PF_* are set) check that CONFIG and detection match; xcppgc.gmk: define both CONFIG_PF_STRING and CONFIG_PF_*. Copied from Perforce Change: 166513 ServerID: perforce.ravenbrook.com --- mps/code/mpstd.h | 132 ++++++++++++++++++++++++++++---------------- mps/code/xcppgc.gmk | 2 + 2 files changed, 87 insertions(+), 47 deletions(-) diff --git a/mps/code/mpstd.h b/mps/code/mpstd.h index e8da6a0c904..fb721e8bdda 100644 --- a/mps/code/mpstd.h +++ b/mps/code/mpstd.h @@ -63,9 +63,11 @@ * them. Alignment from testing. */ -#if defined(CONFIG_PF_I5M2CC) \ - || defined(__sgi) && defined(__unix) && defined(__mips) \ - && defined(_SYSTYPE_SVR4) && (_MIPS_FPSET == 16) +#if defined(__sgi) && defined(__unix) && defined(__mips) \ + && defined(_SYSTYPE_SVR4) && (_MIPS_FPSET == 16) +#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_I5M2CC) +#error "specified CONFIG_PF_... inconsistent with detected i5m2cc" +#endif #define MPS_PF_I5M2CC #define MPS_PF_STRING "i5m2cc" #define MPS_OS_I5 @@ -78,9 +80,11 @@ /* See above. Alignment from testing. */ -#elif defined(CONFIG_PF_IAM4CC) \ - || defined(__sgi) && defined(__unix) && defined(__mips) \ - && defined(_SYSTYPE_SVR4) && defined(_ABIN32) +#elif defined(__sgi) && defined(__unix) && defined(__mips) \ + && defined(_SYSTYPE_SVR4) && defined(_ABIN32) +#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_IAM4CC) +#error "specified CONFIG_PF_... inconsistent with detected iam4cc" +#endif #define MPS_PF_IAM4CC #define MPS_PF_STRING "iam4cc" #define MPS_OS_IA @@ -93,8 +97,10 @@ /* winnt.h from MS VC 2.0 */ -#elif defined(CONFIG_PF_W3ALMV) \ - || defined(_MSC_VER) && defined(_WIN32) && defined(_M_ALPHA) +#elif defined(_MSC_VER) && defined(_WIN32) && defined(_M_ALPHA) +#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_W3ALMV) +#error "specified CONFIG_PF_... inconsistent with detected w3almv" +#endif #define MPS_PF_W3ALMV #define MPS_PF_STRING "w3almv" #define MPS_OS_W3 @@ -107,8 +113,10 @@ /* winnt.h from MS VC 2.0 */ -#elif defined(CONFIG_PF_W3PPMV) \ - || defined(_MSC_VER) && defined(_WIN32) && defined(_M_PPC) +#elif defined(_MSC_VER) && defined(_WIN32) && defined(_M_PPC) +#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_W3PPMV) +#error "specified CONFIG_PF_... inconsistent with detected w3ppmv" +#endif #define MPS_PF_W3PPMV #define MPS_PF_STRING "w3ppmv" #define MPS_OS_W3 @@ -162,8 +170,10 @@ * a way to determine the OS -- we assume MacOS 7. */ -#elif defined(CONFIG_PF_S760MW) \ - || (defined(__MWERKS__) && __MC68K__ == 1) +#elif (defined(__MWERKS__) && __MC68K__ == 1) +#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_S760MW) +#error "specified CONFIG_PF_... inconsistent with detected s760mw" +#endif #define MPS_PF_S760MW #define MPS_PF_STRING "s760mw" #define MPS_OS_S7 @@ -178,8 +188,10 @@ * a way to determine the OS -- we assume MacOS 7. */ -#elif defined(CONFIG_PF_S7PPMW) \ - || defined(__MWERKS__) && __POWERPC__ == 1 +#elif defined(__MWERKS__) && __POWERPC__ == 1 +#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_S7PPMW) +#error "specified CONFIG_PF_... inconsistent with detected s7ppmw" +#endif #define MPS_PF_S7PPMW #define MPS_PF_STRING "s7ppmw" #define MPS_OS_S7 @@ -196,8 +208,10 @@ * which lets us determine the system version. */ -#elif defined(CONFIG_PF_S760AC) \ - || defined(m68k) && (defined (applec) || defined(__SC__)) +#elif defined(m68k) && (defined (applec) || defined(__SC__)) +#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_S760AC) +#error "specified CONFIG_PF_... inconsistent with detected s760ac" +#endif #define MPS_PF_S760AC #define MPS_PF_STRING "s760ac" #define MPS_OS_S7 @@ -214,8 +228,10 @@ * which lets us determine the system version. */ -#elif defined(CONFIG_PF_S7PPAC) \ - || defined(__PPCC__) || (defined(__MRC__) && defined(__POWERPC)) +#elif defined(__PPCC__) || (defined(__MRC__) && defined(__POWERPC)) +#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_S7PPAC) +#error "specified CONFIG_PF_... inconsistent with detected s7ppac" +#endif #define MPS_PF_S7PPAC #define MPS_PF_STRING "s7ppac" #define MPS_OS_S7 @@ -231,9 +247,11 @@ * ools/Preprocessor/Preprocessor.[ef].html> */ -#elif defined(CONFIG_PF_XCPPGC) \ - || defined(__APPLE__) && defined(__ppc__) && defined(__MACH__) \ - && defined(__GNUC__) +#elif defined(__APPLE__) && defined(__ppc__) && defined(__MACH__) \ + && defined(__GNUC__) +#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_XCPPGC) +#error "specified CONFIG_PF_... inconsistent with detected xcppgc" +#endif #define MPS_PF_XCPPGC #define MPS_PF_STRING "xcppgc" #define MPS_OS_XC @@ -249,9 +267,11 @@ * And above for xcppgc. */ -#elif defined(CONFIG_PF_XCI3GC) \ - || defined(__APPLE__) && defined(__i386__) && defined(__MACH__) \ - && defined(__GNUC__) +#elif defined(__APPLE__) && defined(__i386__) && defined(__MACH__) \ + && defined(__GNUC__) +#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_XCI3GC) +#error "specified CONFIG_PF_... inconsistent with detected xci3gc" +#endif #define MPS_PF_XCI3GC #define MPS_PF_STRING "xci3gc" #define MPS_OS_XC @@ -264,9 +284,11 @@ /* GCC 2.5.8, gcc -E -dM, (__SVR4 indicates Solaris) */ -#elif defined(CONFIG_PF_SUS8GC) \ - || defined(__sun__) && defined(__sparc__) && defined(__GNUC__) \ - && !defined(__svr4__) +#elif defined(__sun__) && defined(__sparc__) && defined(__GNUC__) \ + && !defined(__svr4__) +#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_SUS8GC) +#error "specified CONFIG_PF_... inconsistent with detected sus8gc" +#endif #define MPS_PF_SUS8GC #define MPS_PF_STRING "sus8gc" #define MPS_OS_SU @@ -279,9 +301,11 @@ /* LCC 3.4 (ish), man page */ -#elif defined(CONFIG_PF_SUS8LC) \ - || defined(sun) && defined(sparc) && defined(__LCC__) \ - && !defined(__svr4__) +#elif defined(sun) && defined(sparc) && defined(__LCC__) \ + && !defined(__svr4__) +#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_SUS8LC) +#error "specified CONFIG_PF_... inconsistent with detected sus8lc" +#endif #define MPS_PF_SUS8LC #define MPS_PF_STRING "sus8lc" #define MPS_OS_SU @@ -294,9 +318,11 @@ /* GCC 2.5.8, gcc -E -dM */ -#elif defined(CONFIG_PF_SOS8GC) \ - || defined(__sun__) && defined(__sparc__) && defined(__GNUC__) \ - && defined(__svr4__) +#elif defined(__sun__) && defined(__sparc__) && defined(__GNUC__) \ + && defined(__svr4__) +#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_SOS8GC) +#error "specified CONFIG_PF_... inconsistent with detected sos8gc" +#endif #define MPS_PF_SOS8GC #define MPS_PF_STRING "sos8gc" #define MPS_OS_SO @@ -312,9 +338,11 @@ * macros for that. */ -#elif defined(CONFIG_PF_SOS9SC) \ - || defined(__sun) && defined(__SUNPRO_C) && defined(__SVR4) \ - && defined(__sparc) +#elif defined(__sun) && defined(__SUNPRO_C) && defined(__SVR4) \ + && defined(__sparc) +#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_SOS9SC) +#error "specified CONFIG_PF_... inconsistent with detected sos9sc" +#endif #define MPS_PF_SOS9SC #define MPS_PF_STRING "sos9sc" #define MPS_OS_SO @@ -327,8 +355,10 @@ /* GCC 2.6.3, gcc -E -dM */ -#elif defined(CONFIG_PF_O1ALGC) \ - || defined(__osf__) && defined(__alpha__) && defined(__GNUC__) +#elif defined(__osf__) && defined(__alpha__) && defined(__GNUC__) +#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_O1ALGC) +#error "specified CONFIG_PF_... inconsistent with detected o1algc" +#endif #define MPS_PF_O1ALGC #define MPS_PF_STRING "o1algc" #define MPS_OS_O1 @@ -341,8 +371,10 @@ /* From the cc(1) man page */ -#elif defined(CONFIG_PF_O1ALCC) \ - || defined(__osf__) && defined(__alpha) && defined(__DECC) +#elif defined(__osf__) && defined(__alpha) && defined(__DECC) +#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_O1ALCC) +#error "specified CONFIG_PF_... inconsistent with detected o1alcc" +#endif #define MPS_PF_O1ALCC #define MPS_PF_STRING "o1alcc" #define MPS_OS_O1 @@ -358,8 +390,10 @@ * all 4. */ -#elif defined(CONFIG_PF_LII4GC) \ - || defined(__linux__) && defined(__i386__) && defined(__GNUC__) +#elif defined(__linux__) && defined(__i386__) && defined(__GNUC__) +#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_LII4GC) +#error "specified CONFIG_PF_... inconsistent with detected lii4gc" +#endif #define MPS_PF_LII4GC #define MPS_PF_STRING "lii4gc" #define MPS_OS_LI @@ -372,8 +406,10 @@ /* GCC 2.7.2, gcc -E -dM */ -#elif defined(CONFIG_PF_LIPPGC) \ - || defined(__linux__) && defined(__PPC__) && defined(__GNUC__) +#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 @@ -387,8 +423,10 @@ /* GCC 2.95.3, gcc -E -dM */ -#elif defined(CONFIG_PF_FRI4GC) \ - || defined(__FreeBSD__) && defined (__i386__) && defined (__GNUC__) +#elif defined(__FreeBSD__) && defined (__i386__) && defined (__GNUC__) +#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_FRI4GC) +#error "specified CONFIG_PF_... inconsistent with detected fri4gc" +#endif #define MPS_PF_FRI4GC #define MPS_PF_STRING "fri4gc" #define MPS_OS_FR @@ -409,7 +447,7 @@ /* C. COPYRIGHT AND LICENSE * - * Copyright (C) 2001-2002 Ravenbrook Limited . + * Copyright (C) 2001-2002,2008 Ravenbrook Limited . * All rights reserved. This is an open source license. Contact * Ravenbrook for commercial licensing options. * diff --git a/mps/code/xcppgc.gmk b/mps/code/xcppgc.gmk index 47112a0522d..adab791f216 100644 --- a/mps/code/xcppgc.gmk +++ b/mps/code/xcppgc.gmk @@ -5,6 +5,8 @@ PFM = xcppgc +PFMDEFS = -DCONFIG_PF_STRING="xcppgc" -DCONFIG_PF_XCPPGC + MPMPF = lockix.c than.c vmix.c \ protix.c protxcpp.c prmcan.c span.c MPMS = ssxcpp.s