From owner-freebsd-i386@FreeBSD.ORG Thu May 27 08:00:08 2010 Return-Path: Delivered-To: freebsd-i386@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7CA791065677 for ; Thu, 27 May 2010 08:00:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (unknown [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 405D88FC1F for ; Thu, 27 May 2010 08:00:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o4R808th073416 for ; Thu, 27 May 2010 08:00:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o4R80852073415; Thu, 27 May 2010 08:00:08 GMT (envelope-from gnats) Resent-Date: Thu, 27 May 2010 08:00:08 GMT Resent-Message-Id: <201005270800.o4R80852073415@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-i386@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alexander Best Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0D7401065679 for ; Thu, 27 May 2010 07:55:02 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id F0A648FC26 for ; Thu, 27 May 2010 07:55:01 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o4R7t1NR010151 for ; Thu, 27 May 2010 07:55:01 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o4R7t1CC010139; Thu, 27 May 2010 07:55:01 GMT (envelope-from nobody) Message-Id: <201005270755.o4R7t1CC010139@www.freebsd.org> Date: Thu, 27 May 2010 07:55:01 GMT From: Alexander Best To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: i386/147120: [loader] [patch] consistently use 'x86' keyword in loader(8) X-BeenThere: freebsd-i386@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: I386-specific issues for FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 May 2010 08:00:08 -0000 >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@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: