From ee6c26ba7b70879ab906e4b94f81d5e34f8ca078 Mon Sep 17 00:00:00 2001
From: Lauri Tirkkonen <lotheac@iki.fi>
Date: Fri, 23 Nov 2018 17:02:21 +0200
Subject: [PATCH] change MACH32 (i86) to i386

---
 arch/x86/Sconfig                      | 2 +-
 exception_lists/check_rtime           | 4 ++--
 usr/src/Makefile.master               | 2 +-
 usr/src/cmd/ksh/Makefile              | 2 +-
 usr/src/cmd/mdb/common/mdb/mdb.c      | 2 +-
 usr/src/cmd/mdb/common/mdb/mdb_main.c | 2 +-
 usr/src/cmd/ztest/zloop.bash          | 2 +-
 usr/src/pkg/Makefile                  | 2 +-
 usr/src/tools/quick/make-zfs          | 2 +-
 usr/src/tools/scripts/Install.sh      | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/arch/x86/Sconfig b/arch/x86/Sconfig
index 6182a80d6b..b16e16ce58 100644
--- a/arch/x86/Sconfig
+++ b/arch/x86/Sconfig
@@ -4,7 +4,7 @@
 
  (const
    MACH32
-   'i86)
+   'i386)
 
  (const
    MACH64
diff --git a/exception_lists/check_rtime b/exception_lists/check_rtime
index 3a7ad4d1ab..b06b971df9 100644
--- a/exception_lists/check_rtime
+++ b/exception_lists/check_rtime
@@ -214,13 +214,13 @@ FORBIDDEN_DEP   usr/lib/netsvc/yp/ypxfrd        # C++
 FORBIDDEN libfakekernel\.so
 FORBIDDEN_DEP usr/MACH(lib)/libzpool.so.1
 FORBIDDEN_DEP usr/bin/amd64/ztest
-FORBIDDEN_DEP usr/bin/i86/ztest
+FORBIDDEN_DEP usr/bin/i386/ztest
 FORBIDDEN_DEP usr/bin/sparcv7/ztest
 FORBIDDEN_DEP usr/bin/sparcv9/ztest
 FORBIDDEN_DEP usr/lib/MACH(smbsrv)/libfksmbsrv.so.1
 FORBIDDEN_DEP usr/lib/smbsrv/fksmbd
 FORBIDDEN_DEP usr/sbin/amd64/zdb
-FORBIDDEN_DEP usr/sbin/i86/zdb
+FORBIDDEN_DEP usr/sbin/i386/zdb
 FORBIDDEN_DEP usr/sbin/sparcv7/zdb
 FORBIDDEN_DEP usr/sbin/sparcv9/zdb
 
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index c4b4f3359e..1d5c0e769f 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -221,7 +221,7 @@ MACH64_1=	$(MACH:sparc=sparcv9)
 MACH64=		$(MACH64_1:i386=amd64)
 
 MACH32_1=	$(MACH:sparc=sparcv7)
-MACH32=		$(MACH32_1:i386=i86)
+MACH32=		$(MACH32_1:i386=i386)
 
 sparc_BUILD64=
 i386_BUILD64=
diff --git a/usr/src/cmd/ksh/Makefile b/usr/src/cmd/ksh/Makefile
index d1f6aa4672..4e06603e9a 100644
--- a/usr/src/cmd/ksh/Makefile
+++ b/usr/src/cmd/ksh/Makefile
@@ -36,7 +36,7 @@ $(BUILD64)SUBDIRS += $(MACH64)
 
 SUBDIRS += builtins
 
-ARCH32_i386= i86
+ARCH32_i386= i386
 ARCH32_sparc= sparcv7
 ARCH32= $(ARCH32_$(MACH))
 
diff --git a/usr/src/cmd/mdb/common/mdb/mdb.c b/usr/src/cmd/mdb/common/mdb/mdb.c
index 5c1c5fc84a..56d4a6b484 100644
--- a/usr/src/cmd/mdb/common/mdb/mdb.c
+++ b/usr/src/cmd/mdb/common/mdb/mdb.c
@@ -489,7 +489,7 @@ mdb_create(const char *execname, const char *arg0)
 	if (strcmp(strbasename(rootdir), "sparcv9") == 0 ||
 	    strcmp(strbasename(rootdir), "sparcv7") == 0 ||
 	    strcmp(strbasename(rootdir), "amd64") == 0 ||
-	    strcmp(strbasename(rootdir), "i86") == 0)
+	    strcmp(strbasename(rootdir), "i386") == 0)
 		(void) strdirname(rootdir);
 
 	if (strcmp(strbasename(rootdir), "bin") == 0) {
diff --git a/usr/src/cmd/mdb/common/mdb/mdb_main.c b/usr/src/cmd/mdb/common/mdb/mdb_main.c
index 175bd4e74b..d02a3b6285 100644
--- a/usr/src/cmd/mdb/common/mdb/mdb_main.c
+++ b/usr/src/cmd/mdb/common/mdb/mdb_main.c
@@ -1103,7 +1103,7 @@ reexec:
 #ifdef __sparc
 	(void) strcpy(p, "/../sparcv7/");
 #else
-	(void) strcpy(p, "/../i86/");
+	(void) strcpy(p, "/../i386/");
 #endif
 #else
 #ifdef __sparc
diff --git a/usr/src/cmd/ztest/zloop.bash b/usr/src/cmd/ztest/zloop.bash
index 96d796ae0c..db940166b1 100755
--- a/usr/src/cmd/ztest/zloop.bash
+++ b/usr/src/cmd/ztest/zloop.bash
@@ -27,7 +27,7 @@ set +x
 
 sparc_32=sparc
 sparc_64=sparcv9
-i386_32=i86
+i386_32=i386
 i386_64=amd64
 ARCH=`uname -p`
 eval 'ARCHBITS=${'"${ARCH}_${BITS}"'}'
diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile
index 3fb7f24bf2..9d52a21c92 100644
--- a/usr/src/pkg/Makefile
+++ b/usr/src/pkg/Makefile
@@ -157,7 +157,7 @@ PKGVERS= $(PKGVERS_COMPONENT),$(PKGVERS_BUILTON)$(PKGVERS_BRANCH)
 # only defined for the build architecture.  To do cross-platform
 # packaging, we need both values.
 #
-i386_ARCH32= i86
+i386_ARCH32= i386
 i386_ARCH64= amd64
 
 #
diff --git a/usr/src/tools/quick/make-zfs b/usr/src/tools/quick/make-zfs
index 0ede57a7c2..a3c3da78ad 100755
--- a/usr/src/tools/quick/make-zfs
+++ b/usr/src/tools/quick/make-zfs
@@ -31,7 +31,7 @@ i386)
 	x=intel
 	kmdb_arch="amd64"
 	mdb_arch="ia32 amd64"
-	arch32=i86
+	arch32=i386
 	arch64=amd64
 	;;
 sparc)
diff --git a/usr/src/tools/scripts/Install.sh b/usr/src/tools/scripts/Install.sh
index 1d1cbf2e66..cb5a5fa00a 100644
--- a/usr/src/tools/scripts/Install.sh
+++ b/usr/src/tools/scripts/Install.sh
@@ -445,7 +445,7 @@ function copy_kernel {
 
 	case $KARCH in
 		sun4*)		ISA=sparc;	MACH=sparc	;;
-		i86*)		ISA=intel;	MACH=i386	;;
+		i386*)		ISA=intel;	MACH=i386	;;
 		*)		fail "${KARCH}: invalid kernel architecture";;
 	esac
 	export MACH
-- 
2.11.4.GIT