From 579b67d2b03526c12367c8dd96f8f2f5b8b67f1f Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Sat, 4 Jul 2015 01:30:00 +0200
Subject: [PATCH] i386 removal, part 13/x: Some cleanup after pc32 platform
 removal.

---
 Makefile.inc1             | 11 +----------
 share/man/man5/kernconf.5 |  6 ------
 share/man/man7/build.7    |  8 --------
 share/man/man7/vkernel.7  |  9 ++++-----
 share/mk/sys.mk           |  9 +++------
 usr.sbin/config/main.c    |  6 +++---
 6 files changed, 11 insertions(+), 38 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index bba5db2d90..e6bce7659a 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -151,18 +151,9 @@ BUILD_ARCH=	x86_64
 .endif
 .endif
 
-# Backwards compatibility with older make's or older sys.mk's.  make
-# is expected to define MACHINE_PLATFORM.
-#
-.if !defined(MACHINE_PLATFORM)
-MACHINE_PLATFORM= pc32
-.endif
-
 # XXX this is ugly and we need to come up with a nicer solution
 .if !defined(TARGET_PLATFORM)
-.if ${TARGET_ARCH} == "i386"
-TARGET_PLATFORM= pc32
-.elif ${TARGET_ARCH} == "x86_64"
+.if ${TARGET_ARCH} == "x86_64"
 TARGET_PLATFORM= pc64
 .else
 .error Unknown target architecture.
diff --git a/share/man/man5/kernconf.5 b/share/man/man5/kernconf.5
index 95a6682f84..2751dd9095 100644
--- a/share/man/man5/kernconf.5
+++ b/share/man/man5/kernconf.5
@@ -172,16 +172,10 @@ of that language apply.
 Sets the platform of this kernel to
 .Ar name .
 Legal platforms are
-.Sy pc32
-(32 bit
-.Tn Intel
-architecture),
 .Sy pc64
 (64 bit
 .Tn AMD
 architecture),
-.Sy vkernel
-(32 bit virtual kernel),
 and
 .Sy vkernel64
 (64 bit virtual kernel).
diff --git a/share/man/man7/build.7 b/share/man/man7/build.7
index 3378fa7d44..906681fd66 100644
--- a/share/man/man7/build.7
+++ b/share/man/man7/build.7
@@ -181,14 +181,6 @@ These have to be set for cross-building.
 is analogous to the
 .Dq Nm uname Fl p
 output.
-To build for the 32 bit
-.Tn Intel
-architecture known as IA-32, x86 or x86-32, use:
-.Bd -literal -offset indent
-TARGET_ARCH=i386
-TARGET_PLATFORM=pc32
-.Ed
-.Pp
 For the 64 bit
 .Tn AMD
 architecture known as AMD64, x86-64 or Intel 64, use:
diff --git a/share/man/man7/vkernel.7 b/share/man/man7/vkernel.7
index 2ae38b98bc..746ff4c370 100644
--- a/share/man/man7/vkernel.7
+++ b/share/man/man7/vkernel.7
@@ -39,7 +39,6 @@
 .Nm vke
 .Nd virtual kernel architecture
 .Sh SYNOPSIS
-.Cd "platform vkernel   # for 32 bit vkernels"
 .Cd "platform vkernel64 # for 64 bit vkernels"
 .Cd "device vcd"
 .Cd "device vkd"
@@ -518,11 +517,11 @@ network configuration:
 .Sh BUILDING THE WORLD UNDER A VKERNEL
 The virtual kernel platform does not have all the header files expected
 by a world build, so the easiest thing to do right now is to specify a
-pc32 (in a 32 bit vkernel) or pc64 (in a 64 bit vkernel) target when
-building the world under a virtual kernel, like this:
+pc64 (in a 64 bit vkernel) target when building the world under a virtual
+kernel, like this:
 .Bd -literal
-vkernel# make MACHINE_PLATFORM=pc32 buildworld
-vkernel# make MACHINE_PLATFORM=pc32 installworld
+vkernel# make MACHINE_PLATFORM=pc64 buildworld
+vkernel# make MACHINE_PLATFORM=pc64 installworld
 .Ed
 .Sh SEE ALSO
 .Xr vknet 1 ,
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 39968792e7..dc7f8c3df5 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -126,9 +126,9 @@ YFLAGS		?=	-d
 
 # The 'make' program is expected to define the following.
 #
-# MACHINE_PLATFORM	platform architecture (vkernel, pc32)
-# MACHINE		machine architecture (i386, etc..)
-# MACHINE_ARCH		cpu architecture (i386, x86_64, etc)
+# MACHINE_PLATFORM	platform architecture (pc64, vkernel64, etc.)
+# MACHINE		machine architecture (x86_64, etc.)
+# MACHINE_ARCH		cpu architecture (x86_64, etc.)
 #
 .if !defined(MACHINE)
 .error "MACHINE was not defined by make"
@@ -145,9 +145,6 @@ YFLAGS		?=	-d
 .if !defined(MACHINE_PLATFORM)
 MACHINE_PLATFORM!=sysctl -n hw.platform
 .endif
-.if ${MACHINE} == "pc32"
-MACHINE=i386
-.endif
 
 .if defined(%POSIX)
 # Posix 1003.2 mandated rules
diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c
index ab43adaf5f..4c73212cb9 100644
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
@@ -149,15 +149,15 @@ main(int argc, char *argv[])
 	if (yyparse())
 		exit(3);
 	if (platformname == NULL) {
-		printf("Specify platform architecture, e.g. 'platform pc32'\n");
+		printf("Specify platform architecture, e.g. 'platform pc64'\n");
 		exit(1);
 	}
 	if (machinename == NULL) {
-		printf("Specify machine architecture, e.g. 'machine i386'\n");
+		printf("Specify machine architecture, e.g. 'machine x86_64'\n");
 		exit(1);
 	}
 	if (machinearchname == NULL) {
-		printf("Specify cpu architecture, e.g. 'machine_arch i386'\n");
+		printf("Specify cpu architecture, e.g. 'machine_arch x86_64'\n");
 		exit(1);
 	}
 	newbus_ioconf();
-- 
2.41.0