svn commit: r219330 - stable/8/share/mk

[Martin Matuska]

Author: mm
Date: Sun Mar  6 09:02:35 2011
New Revision: 219330
URL: http://svn.freebsd.org/changeset/base/219330

Log:
  MFC r218896:
  
  Add opteron-sse3, athlon64-sse3 and k8-sse3 cpu types to bsd.cpu.mk.
  - add "sse3" to MACHINE_CPU for the new cpu types
  - for i386, default to CPUTYPE=prescott for the new cpu types
  
  PR:		gnu/154906
  Discussed with:	kib, kan, dim

Modified:
  stable/8/share/mk/bsd.cpu.mk
Directory Properties:
  stable/8/share/mk/   (props changed)

Modified: stable/8/share/mk/bsd.cpu.mk
==============================================================================
--- stable/8/share/mk/bsd.cpu.mk	Sun Mar  6 09:01:29 2011	(r219329)
+++ stable/8/share/mk/bsd.cpu.mk	Sun Mar  6 09:02:35 2011	(r219330)
@@ -49,6 +49,9 @@ CPUTYPE = pentiumpro
 CPUTYPE = pentium-mmx
 .  elif ${CPUTYPE} == "i586"
 CPUTYPE = pentium
+.  elif ${CPUTYPE} == "opteron-sse3" || ${CPUTYPE} == "athlon64-sse3" || \
+     ${CPUTYPE} == "k8-sse3"
+CPUTYPE = prescott
 .  elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || \
      ${CPUTYPE} == "k8"
 CPUTYPE = athlon-mp
@@ -156,7 +159,9 @@ _CPUCFLAGS = -mcpu=ultrasparc3
 # presence of a CPU feature.
 
 . if ${MACHINE_ARCH} == "i386"
-.  if ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64"
+.  if ${CPUTYPE} == "opteron-sse3" || ${CPUTYPE} == "athlon64-sse3"
+MACHINE_CPU = athlon-xp athlon k7 3dnow sse3 sse2 sse mmx k6 k5 i586 i486 i386
+.  elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64"
 MACHINE_CPU = athlon-xp athlon k7 3dnow sse2 sse mmx k6 k5 i586 i486 i386
 .  elif ${CPUTYPE} == "athlon-mp" || ${CPUTYPE} == "athlon-xp" || \
     ${CPUTYPE} == "athlon-4"
@@ -195,7 +200,9 @@ MACHINE_CPU = i486 i386
 MACHINE_CPU = i386
 .  endif
 . elif ${MACHINE_ARCH} == "amd64"
-.  if ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || ${CPUTYPE} == "k8"
+.  if ${CPUTYPE} == "opteron-sse3" || ${CPUTYPE} == "athlon64-sse3" || ${CPUTYPE} == "k8-sse3"
+MACHINE_CPU = k8 3dnow sse3
+.  elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || ${CPUTYPE} == "k8"
 MACHINE_CPU = k8 3dnow
 .  elif ${CPUTYPE} == "nocona"
 MACHINE_CPU = sse3