From sa2c@sa2c.net  Tue May 29 05:52:16 2007
Return-Path: <sa2c@sa2c.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 0294A16A49C
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 29 May 2007 05:52:16 +0000 (UTC)
	(envelope-from sa2c@sa2c.net)
Received: from sakura.and.or.jp (sakura.and.or.jp [59.106.20.85])
	by mx1.freebsd.org (Postfix) with ESMTP id CCA1C13C4C7
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 29 May 2007 05:52:15 +0000 (UTC)
	(envelope-from sa2c@sa2c.net)
Received: from sakura.and.or.jp (localhost [127.0.0.1])
	by sakura.and.or.jp (Postfix) with ESMTP id B23B461C34
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 29 May 2007 14:52:14 +0900 (JST)
Received: from berkeley.l.sa2c.net (berkeley.vpn.and.or.jp [10.46.49.3])
	by sakura.and.or.jp (Postfix) with ESMTP id 959C761C2D
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 29 May 2007 14:52:14 +0900 (JST)
Received: by berkeley.l.sa2c.net (Postfix, from userid 3104)
	id 7918A40AF; Tue, 29 May 2007 14:52:14 +0900 (JST)
Message-Id: <20070529055214.7918A40AF@berkeley.l.sa2c.net>
Date: Tue, 29 May 2007 14:52:14 +0900 (JST)
From: NIIMI Satoshi <sa2c@sa2c.net>
Reply-To: NIIMI Satoshi <sa2c@sa2c.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: i686 is not an alias of pentiumpro on GCC 4.2
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         113110
>Category:       i386
>Synopsis:       [mk] [patch] i686 is not an alias of pentiumpro on GCC 4.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-i386
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 29 06:00:11 GMT 2007
>Closed-Date:    Wed Mar 23 07:24:54 UTC 2011
>Last-Modified:  Wed Mar 23 07:24:54 UTC 2011
>Originator:     NIIMI Satoshi
>Release:        FreeBSD 7.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD freebsd7-64 7.0-CURRENT FreeBSD 7.0-CURRENT #1: Tue May 29 13:46:35 JST 2007 root@freebsd7-64:/usr/obj/usr/src/sys/VMWARE amd64


	
>Description:

On GCC 4.2 the definition of "i686" was changed from an alias of
"pentiumpro" to:

|    _i686_
|          Same as `generic', but when used as `march' option, PentiumPro
|          instruction set will be used, so the code will run on all
|          i686 family chips.

	
>How-To-Repeat:
	
>Fix:

	

--- cpu.diff begins here ---
Index: examples/etc/make.conf
===================================================================
RCS file: /home/ncvs/src/share/examples/etc/make.conf,v
retrieving revision 1.279
diff -u -r1.279 make.conf
--- examples/etc/make.conf	17 Jan 2007 12:43:06 -0000	1.279
+++ examples/etc/make.conf	29 May 2007 05:09:57 -0000
@@ -30,6 +30,7 @@
 # NO_CPU_CFLAGS variable below.
 # Currently the following CPU types are recognized:
 #   Intel x86 architecture:
+#       (Generic i686 class CPUs)	i686
 #       (AMD CPUs)	opteron athlon64 athlon-mp athlon-xp athlon-4
 #			athlon-tbird athlon k8 k6-3 k6-2 k6 k5
 #       (Intel CPUs)	core2 core nocona pentium4m pentium4 prescott
Index: mk/bsd.cpu.mk
===================================================================
RCS file: /home/ncvs/src/share/mk/bsd.cpu.mk,v
retrieving revision 1.62
diff -u -r1.62 bsd.cpu.mk
--- mk/bsd.cpu.mk	21 May 2007 08:39:44 -0000	1.62
+++ mk/bsd.cpu.mk	29 May 2007 05:08:21 -0000
@@ -38,8 +38,6 @@
 CPUTYPE = pentium-m
 .  elif ${CPUTYPE} == "p2"
 CPUTYPE = pentium2
-.  elif ${CPUTYPE} == "i686"
-CPUTYPE = pentiumpro
 .  elif ${CPUTYPE} == "i586/mmx"
 CPUTYPE = pentium-mmx
 .  elif ${CPUTYPE} == "i586"
@@ -90,7 +88,8 @@
 .  elif ${CPUTYPE} == "pentium3" || ${CPUTYPE} == "pentium3m" || \
      ${CPUTYPE} == "pentium-m"
 _ICC_CPUCFLAGS = -tpp6 -xiMK
-.  elif ${CPUTYPE} == "pentium2" || ${CPUTYPE} == "pentiumpro"
+.  elif ${CPUTYPE} == "pentium2" || ${CPUTYPE} == "pentiumpro" || \
+     ${CPUTYPE} == "i686"
 _ICC_CPUCFLAGS = -tpp6 -xiM
 .  elif ${CPUTYPE} == "pentium-mmx"
 _ICC_CPUCFLAGS = -tpp5 -xM
@@ -139,7 +138,7 @@
 MACHINE_CPU = sse i686 mmx i586 i486 i386
 .  elif ${CPUTYPE} == "pentium2"
 MACHINE_CPU = i686 mmx i586 i486 i386
-.  elif ${CPUTYPE} == "pentiumpro"
+.  elif ${CPUTYPE} == "pentiumpro" || ${CPUTYPE} == "i686"
 MACHINE_CPU = i686 i586 i486 i386
 .  elif ${CPUTYPE} == "pentium-mmx"
 MACHINE_CPU = mmx i586 i486 i386
--- cpu.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: remko 
State-Changed-When: Wed Mar 23 07:24:53 UTC 2011 
State-Changed-Why:  
It seems that this code had been imported already. 

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