From root@dementia.afflictions.org  Sun May  8 16:01:12 2005
Return-Path: <root@dementia.afflictions.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A337116A4E3
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  8 May 2005 16:01:12 +0000 (GMT)
Received: from pandora.afflictions.org (asylum.afflictions.org [64.7.134.90])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1AA0E43DB7
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  8 May 2005 16:01:12 +0000 (GMT)
	(envelope-from root@dementia.afflictions.org)
Received: from localhost (localhost [127.0.0.1])
	by pandora.afflictions.org (Postfix) with ESMTP id 9A1D078C70
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  8 May 2005 12:01:13 -0400 (EDT)
Received: from pandora.afflictions.org ([127.0.0.1])
 by localhost (pandora.afflictions.org [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id 69767-10 for <FreeBSD-gnats-submit@freebsd.org>;
 Sun,  8 May 2005 12:01:08 -0400 (EDT)
Received: from dementia.afflictions.org (dementia.afflictions.org [172.19.206.56])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pandora.afflictions.org (Postfix) with ESMTP id 0F3F078C64
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  8 May 2005 12:01:08 -0400 (EDT)
Received: by dementia.afflictions.org (Postfix, from userid 0)
	id E57BC33C79; Sun,  8 May 2005 12:01:03 -0400 (EDT)
Message-Id: <20050508160103.E57BC33C79@dementia.afflictions.org>
Date: Sun,  8 May 2005 12:01:03 -0400 (EDT)
From: Damian Gerow <dgerow@dementia.afflictions.org>
Reply-To: Damian Gerow <dgerow@dementia.afflictions.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Categorization of 'nocona' in examples/etc/make.conf is wrong
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         80788
>Category:       conf
>Synopsis:       Categorization of 'nocona' in examples/etc/make.conf is wrong
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 08 16:10:02 GMT 2005
>Closed-Date:    Sun May 08 16:18:02 GMT 2005
>Last-Modified:  Sun May 08 16:18:02 GMT 2005
>Originator:     Damian Gerow
>Release:        FreeBSD 5.4-STABLE amd64
>Organization:
>Environment:
System: FreeBSD dementia.afflictions.org 5.4-STABLE FreeBSD 5.4-STABLE #1: Thu May 5 19:13:47 EDT 2005 root@:/usr/obj/usr/src/sys/GENERIC amd64


	
>Description:
In examples/etc/make.conf, nocona is listed, within the 'Intel x86
architecture', as an 'AMD CPU':

# Currently the following CPU types are recognized:
#   Intel x86 architecture:
#       (AMD CPUs)      opteron athlon64 athlon-mp athlon-xp athlon-4
#                       athlon-tbird athlon k8 k6-3 k6-2 k6 k5 nocona

Which is wrong.  It is, IIRC, correctly listed as an AMD64 architecture
further down:

#   AMD64 architecture: opteron, athlon64, nocona

Which is probably where the confusion came from.  Nocona is most definitely
and Intel CPU.

>How-To-Repeat:
Check out source.  Look at examples/etc/make.conf.

>Fix:

Patch:

--- make.conf.orig      Sun May  8 11:58:03 2005
+++ make.conf   Sun May  8 11:59:03 2005
@@ -31,9 +31,9 @@
 # Currently the following CPU types are recognized:
 #   Intel x86 architecture:
 #       (AMD CPUs)     opteron athlon64 athlon-mp athlon-xp athlon-4
-#                      athlon-tbird athlon k8 k6-3 k6-2 k6 k5 nocona
-#       (Intel CPUs)   pentium4[m] prescott pentium3[m] pentium2 penitumpro
-#                      pentium-mmx pentium i486 i386
+#                      athlon-tbird athlon k8 k6-3 k6-2 k6 k5
+#       (Intel CPUs)   nocona pentium4[m] prescott pentium3[m] pentium2
+#                      penitumpro pentium-mmx pentium i486 i386
 #   Alpha/AXP architecture: ev67 ev6 pca56 ev56 ev5 ev45 ev4
 #   AMD64 architecture: opteron, athlon64, nocona
 #   Intel ia64 architecture: itanium2, itanium
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: maxim 
State-Changed-When: Sun May 8 16:17:04 GMT 2005 
State-Changed-Why:  
des@ already fixed this issue in rev. 1.264 share/examples/etc/make.conf 

http://www.freebsd.org/cgi/query-pr.cgi?pr=80788 
>Unformatted:
