Correcting misnamed i4 architecture to i3. this distinction was once slightly useful for optimisation, but no longer makes any sense.

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

6 files changed, 19 insertions, 19 deletions

diff --git a/mps/code/fri4gc.gmk b/mps/code/fri3gc.gmk
index 3bc48a35a79..1f07c612fe0 100644
--- a/mps/code/fri4gc.gmk
+++ b/mps/code/fri3gc.gmk
@@ -1,9 +1,9 @@
-# fri4gc.gmk: BUILD FOR FreeBSD/i386/GCC PLATFORM
+# fri3gc.gmk: BUILD FOR FreeBSD/i386/GCC PLATFORM
 #
 # $Id$
 # Copyright (c) 2001 Ravenbrook Limited.  See end of file for license.
 
-PFM = fri4gc
+PFM = fri3gc
 
 PFMDEFS = -D_REENTRANT
 
diff --git a/mps/code/lii4gc.gmk b/mps/code/lii3gc.gmk
index 67664553fb2..2ccd1370440 100644
--- a/mps/code/lii4gc.gmk
+++ b/mps/code/lii3gc.gmk
@@ -1,9 +1,9 @@
-# lii4gc.gmk: BUILD FOR LINUX/INTEL/GCC PLATFORM
+# lii3gc.gmk: BUILD FOR LINUX/INTEL/GCC PLATFORM
 #
 # $Id$
 # Copyright (c) 2001 Ravenbrook Limited.  See end of file for license.
 
-PFM = lii4gc
+PFM = lii3gc
 
 THREADSRC = lockli.c thix.c pthrdext.c
 THREADLIB = -lpthread
diff --git a/mps/code/mps.c b/mps/code/mps.c
index 6de34a4dac0..08b10c7b2a2 100644
--- a/mps/code/mps.c
+++ b/mps/code/mps.c
@@ -107,7 +107,7 @@
 
 /* FreeBSD on 32-bit Intel built with GCC */
 
-#elif defined(MPS_PF_FRI4GC)
+#elif defined(MPS_PF_FRI3GC)
 
 #include "lockix.c"     /* Posix locks */
 #include "thfri4.c"     /* FreeBSD on 32-bit Intel threading */
@@ -121,7 +121,7 @@
 
 /* Linux on 32-bit Intel with GCC */
 
-#elif defined(MPS_PF_LII4GC)
+#elif defined(MPS_PF_LII3GC)
 
 #include "lockli.c"     /* Linux locks */
 #include "thix.c"       /* Posix threading */
diff --git a/mps/code/mpstd.h b/mps/code/mpstd.h
index 3977e63a5af..10d3d2833a6 100644
--- a/mps/code/mpstd.h
+++ b/mps/code/mpstd.h
@@ -169,13 +169,13 @@
  */
 
 #elif defined(__linux__) && defined(__i386__) && defined(__GNUC__)
-#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_LII4GC)
-#error "specified CONFIG_PF_... inconsistent with detected lii4gc"
+#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_LII3GC)
+#error "specified CONFIG_PF_... inconsistent with detected lii3gc"
 #endif
-#define MPS_PF_LII4GC
-#define MPS_PF_STRING   "lii4gc"
+#define MPS_PF_LII3GC
+#define MPS_PF_STRING   "lii3gc"
 #define MPS_OS_LI
-#define MPS_ARCH_I4
+#define MPS_ARCH_I3
 #define MPS_BUILD_GC
 #define MPS_T_WORD      unsigned long
 #define MPS_T_ULONGEST  unsigned long
@@ -220,13 +220,13 @@
 /* GCC 2.95.3, gcc -E -dM */
 
 #elif defined(__FreeBSD__) && defined (__i386__) && defined (__GNUC__)
-#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_FRI4GC)
-#error "specified CONFIG_PF_... inconsistent with detected fri4gc"
+#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_FRI3GC)
+#error "specified CONFIG_PF_... inconsistent with detected fri3gc"
 #endif
-#define MPS_PF_FRI4GC
-#define MPS_PF_STRING   "fri4gc"
+#define MPS_PF_FRI3GC
+#define MPS_PF_STRING   "fri3gc"
 #define MPS_OS_FR
-#define MPS_ARCH_I4
+#define MPS_ARCH_I3
 #define MPS_BUILD_GC
 #define MPS_T_WORD      unsigned long
 #define MPS_T_ULONGEST  unsigned long
diff --git a/mps/code/prmci3li.c b/mps/code/prmci3li.c
index 70b9b2a34d9..9c606f181ab 100644
--- a/mps/code/prmci3li.c
+++ b/mps/code/prmci3li.c
@@ -46,7 +46,7 @@ MRef Prmci3AddressHoldingReg(MutatorFaultContext mfc, unsigned int regnum)
   /* .source.i486 */
   /* .assume.regref */
   /* The REG_EAX etc. symbols are only present if _GNU_SOURCE is defined.
-     Currently this is in lii4gc.gmk in PFMDEFS. */
+     Currently this is in lii3gc.gmk in PFMDEFS. */
   switch (regnum) {
     case 0: return &gregs[REG_EAX];
     case 1: return &gregs[REG_ECX];
diff --git a/mps/code/protlii3.c b/mps/code/protlii3.c
index 3c857c53aa4..f92cbfe2f88 100644
--- a/mps/code/protlii3.c
+++ b/mps/code/protlii3.c
@@ -16,8 +16,8 @@
 #ifndef MPS_OS_LI
 #error "protlii3.c is Linux-specific, but MPS_OS_LI is not set"
 #endif
-#if !defined(MPS_ARCH_I3) && !defined(MPS_ARCH_I4)
-#error "protlii3.c is Intel-specific, but MPS_ARCH_I3 or MPS_ARCH_I4 is not set"
+#if !defined(MPS_ARCH_I3)
+#error "protlii3.c is Intel-specific, but MPS_ARCH_I3 is not set"
 #endif
 #ifndef PROTECTION
 #error "protlii3.c implements protection, but PROTECTION is not set"