svn commit: r217005 - in stable/7/share: examples/etc mk

[Marius Strobl]

Author: marius
Date: Wed Jan  5 13:36:59 2011
New Revision: 217005
URL: http://svn.freebsd.org/changeset/base/217005

Log:
  MFC: r216820 (partial)
  
  Add CPUTYPE support for sparc64. The net result is that it's now possible
  to let the compiler optimize for the famility of UltraSPARC-III CPUs as the
  default already was to optimize for UltraSPARC-I/II and generating generic
  64-bit V9 is mainly for reference purposes. At least for SPARC64-V CPUs
  code optimized for UltraSPARC-I/II still is the most performant one.
  Thanks go to Michael Moll for testing SPARC64-V.

Modified:
  stable/7/share/examples/etc/make.conf
  stable/7/share/mk/bsd.cpu.mk
Directory Properties:
  stable/7/share/examples/   (props changed)
  stable/7/share/mk/   (props changed)

Modified: stable/7/share/examples/etc/make.conf
==============================================================================
--- stable/7/share/examples/etc/make.conf	Wed Jan  5 13:26:26 2011	(r217004)
+++ stable/7/share/examples/etc/make.conf	Wed Jan  5 13:36:59 2011	(r217005)
@@ -39,6 +39,8 @@
 #   Alpha/AXP architecture: ev67 ev6 pca56 ev56 ev5 ev45 ev4
 #   AMD64 architecture: opteron, athlon64, nocona, prescott, core2
 #   Intel ia64 architecture: itanium2, itanium
+#   SPARC-V9 architecture:	v9 (generic 64-bit V9), ultrasparc (default
+#				if omitted), ultrasparc3
 #
 # (?= allows to buildworld for a different CPUTYPE.)
 #

Modified: stable/7/share/mk/bsd.cpu.mk
==============================================================================
--- stable/7/share/mk/bsd.cpu.mk	Wed Jan  5 13:26:26 2011	(r217004)
+++ stable/7/share/mk/bsd.cpu.mk	Wed Jan  5 13:36:59 2011	(r217005)
@@ -13,6 +13,7 @@ MACHINE_CPU = amd64 sse2 sse mmx
 . elif ${MACHINE_ARCH} == "ia64"
 MACHINE_CPU = itanium
 . elif ${MACHINE_ARCH} == "sparc64"
+MACHINE_CPU = ultrasparc
 . elif ${MACHINE_ARCH} == "arm"
 MACHINE_CPU = arm
 . endif
@@ -54,6 +55,12 @@ CPUTYPE = athlon
 .  if ${CPUTYPE} == "prescott" || ${CPUTYPE} == "core2"
 CPUTYPE = nocona
 .  endif
+. elif ${MACHINE_ARCH} == "sparc64"
+.  if ${CPUTYPE} == "us"
+CPUTYPE = ultrasparc
+.  elif ${CPUTYPE} == "us3"
+CPUTYPE = ultrasparc3
+.  endif
 . endif
 
 ###############################################################################
@@ -111,6 +118,14 @@ _CPUCFLAGS = -mcpu=${CPUTYPE}
 .  endif
 . elif ${MACHINE_ARCH} == "powerpc"
 _CPUCFLAGS = -mcpu=${CPUTYPE}
+. elif ${MACHINE_ARCH} == "sparc64"
+.  if ${CPUTYPE} == "v9"
+_CPUCFLAGS = -mcpu=v9
+.  elif ${CPUTYPE} == "ultrasparc"
+_CPUCFLAGS = -mcpu=ultrasparc
+.  elif ${CPUTYPE} == "ultrasparc3"
+_CPUCFLAGS = -mcpu=ultrasparc3
+.  endif
 . endif
 
 # Set up the list of CPU features based on the CPU type.  This is an
@@ -167,6 +182,14 @@ MACHINE_CPU += amd64 sse2 sse mmx
 .  if ${CPUTYPE} == "itanium"
 MACHINE_CPU = itanium
 .  endif
+. elif ${MACHINE_ARCH} == "sparc64"
+.  if ${CPUTYPE} == "v9"
+MACHINE_CPU = v9
+.  elif ${CPUTYPE} == "ultrasparc"
+MACHINE_CPU = v9 ultrasparc
+.  elif ${CPUTYPE} == "ultrasparc3"
+MACHINE_CPU = v9 ultrasparc ultrasparc3
+.  endif
 . endif
 .endif