i386/147120: [loader] [patch] consistently use 'x86' keyword in loader(8)

[Alexander Best]

>Number:         147120
>Category:       i386
>Synopsis:       [loader] [patch] consistently use 'x86' keyword in loader(8)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-i386
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 27 08:00:07 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Alexander Best
>Release:        9.0-CURRENT
>Organization:
>Environment:
FreeBSD otaku 9.0-CURRENT FreeBSD 9.0-CURRENT #0 r207931M: Tue May 11 21:43:46 CEST 2010     root at otaku:/usr/obj/usr/src/sys/ARUNDEL  amd64
>Description:
it was decided that the keyword 'x86' should be used for code that's being shared between i386 and amd64. [1] [2]

cheers.

[1] r205662
[2] http://www.mail-archive.com/freebsd-hackers@freebsd.org/msg70613.html
>How-To-Repeat:

>Fix:
apply the attached patch.

Patch attached with submission follows:

Index: sys/boot/i386/zfsloader/Makefile
===================================================================
--- sys/boot/i386/zfsloader/Makefile	(revision 208580)
+++ sys/boot/i386/zfsloader/Makefile	(working copy)
@@ -3,7 +3,7 @@
 .PATH:	${.CURDIR}/../loader
 
 LOADER=		zfsloader
-NEWVERSWHAT=	"ZFS enabled bootstrap loader" i386
+NEWVERSWHAT=	"ZFS enabled bootstrap loader" x86
 LOADER_ZFS_SUPPORT=yes
 LOADER_ONLY=	yes
 NO_MAN=		yes
Index: sys/boot/i386/efi/Makefile
===================================================================
--- sys/boot/i386/efi/Makefile	(revision 208580)
+++ sys/boot/i386/efi/Makefile	(working copy)
@@ -42,7 +42,7 @@
 
 CLEANFILES=	vers.c loader.efi
 
-NEWVERSWHAT=	"EFI loader" ${MACHINE_ARCH}
+NEWVERSWHAT=	"EFI loader" x86
 
 vers.c:	${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
 	sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
Index: sys/boot/i386/loader/Makefile
===================================================================
--- sys/boot/i386/loader/Makefile	(revision 208580)
+++ sys/boot/i386/loader/Makefile	(working copy)
@@ -6,7 +6,7 @@
 LOADER?=	loader
 PROG=		${LOADER}.sym
 INTERNALPROG=
-NEWVERSWHAT?=	"bootstrap loader" i386
+NEWVERSWHAT?=	"bootstrap loader" x86
 
 # architecture-specific loader code
 SRCS=		main.c conf.c vers.c


>Release-Note:
>Audit-Trail:
>Unformatted: