conf/84800: setting CPUTYPE=nocona on an Intel system results in -march=prescott being used

[Michael Conlen]

>Number:         84800
>Category:       conf
>Synopsis:       setting CPUTYPE=nocona on an Intel system results in -march=prescott being used
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 11 14:30:17 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Michael Conlen
>Release:        5.4-RELEASE-p6
>Organization:
Conlen & Associates Consulting, Inc.
>Environment:
FreeBSD db1 5.4-RELEASE-p6 FreeBSD 5.4-RELEASE-p6 #0: Wed Aug 10 06:22:56 EDT 2005     root@:/usr/obj/usr/src/sys/DB  i386

>Description:
The file /usr/share/mk/bsd.cpu.mk thinks that a nocona processor is an AMD processor as opposed to Intel and will change the CPUTYPE from nocona to prescott on an Intel Xeon "nocona" system. I've made the change and built world/kernel and many ports including MySQL with nocona. 

      
>How-To-Repeat:
set CPUTYPE=nocona in make.conf on a nocona system and buildworld, watch as it uses -march=prescott
>Fix:
This isn't the best of solutions but it was quick and dirty and it's the one that works. Obviously the whole logic could be reworked but I need to get this box in to production. 


--- bsd.cpu.mk.orig     Thu Aug 11 10:10:24 2005
+++ bsd.cpu.mk  Thu Aug 11 10:10:06 2005
@@ -24,7 +24,7 @@
 
 . if ${MACHINE_ARCH} == "i386"
 .  if ${CPUTYPE} == "nocona"
-CPUTYPE = prescott
+CPUTYPE = nocona
 .  elif ${CPUTYPE} == "p4"
 CPUTYPE = pentium4
 .  elif ${CPUTYPE} == "p4m"
      
>Release-Note:
>Audit-Trail:
>Unformatted: