conf/80788: Categorization of 'nocona' in examples/etc/make.conf is wrong

[Damian Gerow]

>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:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 08 16:10:02 GMT 2005
>Closed-Date:
>Last-Modified:
>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:
>Unformatted: