Index: head/share/examples/etc/make.conf
===================================================================
--- head/share/examples/etc/make.conf	(revision 160496)
+++ head/share/examples/etc/make.conf	(revision 160497)
@@ -1,266 +1,267 @@
 # $FreeBSD$
 #
 # NOTE:  Please would any committer updating this file also update the
 # make.conf(5) manual page, if necessary, which is located in
 # src/share/man/man5/make.conf.5.
 #
 # /etc/make.conf, if present, will be read by make (see
 # /usr/share/mk/sys.mk).  It allows you to override macro definitions
 # to make without changing your source tree, or anything the source
 # tree installs.
 #
 # This file must be in valid Makefile syntax.
 #
 # There are additional things you can put into /etc/make.conf.
 # You have to find those in the Makefiles and documentation of
 # the source tree.
 #
 # Note, that you should not set MAKEOBJDIRPREFIX or MAKEOBJDIR
 # from make.conf (or as command line variables to make).
 # Both variables are environment variables for make and must be used as:
 #
 # env MAKEOBJDIRPREFIX=/big/directory make
 #
 #
 # The CPUTYPE variable controls which processor should be targeted for
 # generated code.  This controls processor-specific optimizations in
 # certain code (currently only OpenSSL) as well as modifying the value
 # of CFLAGS to contain the appropriate optimization directive to gcc.
 # The automatic setting of CFLAGS may be overridden using the
 # NO_CPU_CFLAGS variable below.
 # 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
 #       (Intel CPUs)	nocona pentium4[m] prescott pentium3[m] pentium-m
 #			pentium2 pentiumpro pentium-mmx pentium i486 i386
+#       (Via CPUs)	c3 c3-2
 #   Alpha/AXP architecture: ev67 ev6 pca56 ev56 ev5 ev45 ev4
 #   AMD64 architecture: opteron, athlon64, nocona
 #   Intel ia64 architecture: itanium2, itanium
 #
 # (?= allows to buildworld for a different CPUTYPE.)
 #
 #CPUTYPE?=pentium3
 #NO_CPU_CFLAGS=		# Don't add -march=<cpu> to CFLAGS automatically
 #NO_CPU_COPTFLAGS=	# Don't add -march=<cpu> to COPTFLAGS automatically
 #
 # CFLAGS controls the compiler settings used when compiling C code.
 # Note that optimization settings other than -O and -O2 are not recommended
 # or supported for compiling the world or the kernel - please revert any
 # nonstandard optimization settings to "-O" or -O2 before submitting bug
 # reports without patches to the developers.
 #
 #CFLAGS= -O -pipe
 #
 # CXXFLAGS controls the compiler settings used when compiling C++ code.
 # Note that CXXFLAGS is initially set to the value of CFLAGS.  If you wish
 # to add to CXXFLAGS value, "+=" must be used rather than "=".  Using "="
 # alone will remove the often needed contents of CFLAGS from CXXFLAGS.
 #
 #CXXFLAGS+= -fconserve-space
 #
 # MAKE_SHELL controls the shell used internally by make(1) to process the
 # command scripts in makefiles.  Three shells are supported, sh, ksh, and
 # csh.  Using sh is most common, and advised.  Using ksh *may* work, but is
 # not guaranteed to.  Using csh is absurd.  The default is to use sh.
 #
 #MAKE_SHELL?=sh
 #
 # BDECFLAGS are a set of gcc warning settings that Bruce Evans has suggested
 # for use in developing FreeBSD and testing changes.  They can be used by
 # putting "CFLAGS+=${BDECFLAGS}" in /etc/make.conf.  -Wconversion is not
 # included here due to compiler bugs, e.g., mkdir()'s mode_t argument.
 #
 #BDECFLAGS=	-W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \
 #		-Wcast-qual -Wchar-subscripts -Winline \
 #		-Wmissing-prototypes -Wnested-externs -Wpointer-arith \
 #		-Wredundant-decls -Wshadow -Wstrict-prototypes -Wwrite-strings
 #
 # To compile just the kernel with special optimizations, you should use
 # this instead of CFLAGS (which is not applicable to kernel builds anyway).
 # There is very little to gain by using higher optimization levels, and doing
 # so can cause problems.
 #
 #COPTFLAGS= -O -pipe
 #
 # Compare before install
 #INSTALL=install -C
 #
 # Mtree will follow symlinks
 #MTREE_FOLLOWS_SYMLINKS= -L
 #
 # To enable installing ssh(1) with the setuid bit turned on
 #ENABLE_SUID_SSH=
 #
 # To enable installing newgrp(1) with the setuid bit turned on.
 # Without the setuid bit, newgrp cannot change users' groups.
 #ENABLE_SUID_NEWGRP=
 #
 # To avoid building various parts of the base system:
 #NO_MODULES=		# do not build modules with the kernel
 #NO_SHARE=		# do not go into the share subdir
 #NO_SHARED= 		# build /bin and /sbin statically linked (bad idea)
 #
 # Variables that control how ppp(8) is built.
 #PPP_NO_NAT= 		# do not build with NAT support (see make.conf(5))
 #PPP_NO_NETGRAPH= 	# do not build with Netgraph support
 #PPP_NO_RADIUS= 	# do not build with RADIUS support
 #PPP_NO_SUID=		# build with normal permissions
 #
 #TRACEROUTE_NO_IPSEC= 	# do not build traceroute(8) with IPSEC support
 #
 # To build sys/modules when building the world (our old way of doing things)
 #MODULES_WITH_WORLD=	# do not build modules when building kernel
 #
 # The list of modules to build instead of all of them.
 #MODULES_OVERRIDE=	linux ipfw
 #
 # The list of modules to never build, applied *after* MODULES_OVERRIDE.
 #WITHOUT_MODULES=	bktr plip
 #
 # If you do not want unformatted manual pages to be compressed
 # when they are installed:
 #
 #NO_MANCOMPRESS=
 #
 #
 # Default format for system documentation, depends on your printer.
 # Set this to "ascii" for simple printers or screen
 #
 #PRINTERDEVICE=	ps
 #
 #
 # How long to wait for a console keypress before booting the default kernel.
 # This value is approximately in milliseconds. Keypresses are accepted by the
 # BIOS before booting from disk, making it possible to give custom boot
 # parameters even when this is set to 0.
 #
 #BOOTWAIT=0
 #BOOTWAIT=30000
 #
 # By default, the system will always use the keyboard/video card as system
 # console.  However, the boot blocks may be dynamically configured to use a
 # serial port in addition to or instead of the keyboard/video console.
 #
 # By default we use COM1 as our serial console port *if* we're going to use
 # a serial port as our console at all.  Alter as necessary.
 #
 #   COM1: = 0x3F8, COM2: = 0x2F8, COM3: = 0x3E8, COM4: = 0x2E8
 #
 #BOOT_COMCONSOLE_PORT=	0x3F8
 #
 # The default serial console speed is 9600.  Set the speed to a larger value
 # for better interactive response.
 #
 #BOOT_COMCONSOLE_SPEED=	115200
 #
 # By default the 'pxeboot' loader retrieves the kernel via NFS.  Defining
 # this and recompiling /usr/src/sys/boot will cause it to retrieve the kernel
 # via TFTP.  This allows pxeboot to load a custom BOOTP diskless kernel yet
 # still mount the server's '/' (i.e. rather than load the server's kernel).
 #
 #LOADER_TFTP_SUPPORT= YES
 #
 #
 # Kerberos 5 su (k5su)
 # If you want to use the k5su utility, define this to have it installed
 # set-user-ID.
 #ENABLE_SUID_K5SU=
 #
 #
 # CVSup update flags.  Edit SUPFILE settings to reflect whichever distribution
 # file(s) you use on your site (see /usr/share/examples/cvsup/README for more
 # information on CVSup and these files).  To use, do "make update" in /usr/src.
 #
 #SUP_UPDATE=
 #
 #SUP=            /usr/bin/csup
 #SUPFLAGS=       -g -L 2
 #SUPHOST=        cvsup.uk.FreeBSD.org
 #SUPFILE=        /usr/share/examples/cvsup/standard-supfile
 #PORTSSUPFILE=   /usr/share/examples/cvsup/ports-supfile
 #DOCSUPFILE=     /usr/share/examples/cvsup/doc-supfile
 #
 # top(1) uses a hash table for the user names.  The size of this hash
 # can be tuned to match the number of local users.  The table size should
 # be a prime number approximately twice as large as the number of lines in
 # /etc/passwd.  The default number is 20011.
 #
 #TOP_TABLE_SIZE= 101
 #
 # Documentation
 #
 # The list of languages and encodings to build and install
 #
 #DOC_LANG=	en_US.ISO8859-1 ru_RU.KOI8-R
 #
 #
 # sendmail
 #
 # The following sets the default m4 configuration file to use at
 # install time.  Use with caution as a make install will overwrite
 # any existing /etc/mail/sendmail.cf.  Note that SENDMAIL_CF is now
 # deprecated.  The value should be a fully qualified path name.
 #
 #SENDMAIL_MC=/etc/mail/myconfig.mc
 #
 # The following sets the default m4 configuration file for mail
 # submission to use at install time.  Use with caution as a make
 # install will overwrite any existing /etc/mail/submit.cf.  The
 # value should be a fully qualified path name.
 #
 #SENDMAIL_SUBMIT_MC=/etc/mail/mysubmit.mc
 #
 # If you need to build additional .cf files during a make buildworld,
 # include the full paths to the .mc files in SENDMAIL_ADDITIONAL_MC.
 #
 #SENDMAIL_ADDITIONAL_MC=/etc/mail/foo.mc /etc/mail/bar.mc
 #
 # The following overrides the default location for the m4 configuration
 # files used to build a .cf file from a .mc file.
 #
 #SENDMAIL_CF_DIR=/usr/local/share/sendmail/cf
 #
 # Setting the following variable modifies the flags passed to m4 when
 # building a .cf file from a .mc file.  It can be used to enable
 # features disabled by default.
 #
 #SENDMAIL_M4_FLAGS=
 #
 # Setting the following variables modifies the build environment for
 # sendmail and its related utilities. For example, SASL support can be
 # added with settings such as:
 #
 #    with SASLv1:
 #	SENDMAIL_CFLAGS=-I/usr/local/include/sasl1 -DSASL
 #	SENDMAIL_LDFLAGS=-L/usr/local/lib
 #	SENDMAIL_LDADD=-lsasl
 #
 #    with SASLv2:
 #	SENDMAIL_CFLAGS=-I/usr/local/include -DSASL=2
 #	SENDMAIL_LDFLAGS=-L/usr/local/lib
 #	SENDMAIL_LDADD=-lsasl2
 #
 # Note: If you are using Cyrus SASL with other applications which require
 #	access to the sasldb file, you should add the following to your
 #	sendmail.mc file:
 #
 #	define(`confDONT_BLAME_SENDMAIL',`GroupReadableSASLDBFile')
 #
 #SENDMAIL_CFLAGS=
 #SENDMAIL_LDFLAGS=
 #SENDMAIL_LDADD=
 #SENDMAIL_DPADD=
 #
 # Setting SENDMAIL_SET_USER_ID will install the sendmail binary as a
 # set-user-ID root binary instead of a set-group-ID smmsp binary and will
 # prevent the installation of /etc/mail/submit.cf.
 # This is a deprecated mode of operation.  See etc/mail/README for more
 # information.
 #
 #SENDMAIL_SET_USER_ID=
 #
 # The permissions to use on alias and map databases generated using
 # /etc/mail/Makefile.  Defaults to 0640.
 #
 #SENDMAIL_MAP_PERMS=
Index: head/share/mk/bsd.cpu.mk
===================================================================
--- head/share/mk/bsd.cpu.mk	(revision 160496)
+++ head/share/mk/bsd.cpu.mk	(revision 160497)
@@ -1,194 +1,198 @@
 # $FreeBSD$
 
 # Set default CPU compile flags and baseline CPUTYPE for each arch.  The
 # compile flags must support the minimum CPU type for each architecture but
 # may tune support for more advanced processors.
 
 .if !defined(CPUTYPE) || empty(CPUTYPE)
 _CPUCFLAGS =
 . if ${MACHINE_ARCH} == "i386"
 MACHINE_CPU = i486
 . elif ${MACHINE_ARCH} == "alpha"
 _CPUCFLAGS = -mcpu=ev4 -mtune=ev5
 MACHINE_CPU = ev4
 . elif ${MACHINE_ARCH} == "amd64"
 MACHINE_CPU = amd64 sse2 sse
 . elif ${MACHINE_ARCH} == "ia64"
 MACHINE_CPU = itanium
 . elif ${MACHINE_ARCH} == "sparc64"
 . elif ${MACHINE_ARCH} == "arm"
 MACHINE_CPU = arm
 . endif
 .else
 
 # Handle aliases (not documented in make.conf to avoid user confusion
 # between e.g. i586 and pentium)
 
 . if ${MACHINE_ARCH} == "i386"
 .  if ${CPUTYPE} == "nocona"
 CPUTYPE = prescott
 .  elif ${CPUTYPE} == "p4"
 CPUTYPE = pentium4
 .  elif ${CPUTYPE} == "p4m"
 CPUTYPE = pentium4m
 .  elif ${CPUTYPE} == "p3"
 CPUTYPE = pentium3
 .  elif ${CPUTYPE} == "p3m"
 CPUTYPE = pentium3m
 .  elif ${CPUTYPE} == "p-m"
 CPUTYPE = pentium-m
 .  elif ${CPUTYPE} == "p2"
 CPUTYPE = pentium2
 .  elif ${CPUTYPE} == "i686"
 CPUTYPE = pentiumpro
 .  elif ${CPUTYPE} == "i586/mmx"
 CPUTYPE = pentium-mmx
 .  elif ${CPUTYPE} == "i586"
 CPUTYPE = pentium
 .  elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || \
      ${CPUTYPE} == "k8"
 CPUTYPE = athlon-mp
 .  elif ${CPUTYPE} == "k7"
 CPUTYPE = athlon
 .  endif
 . elif ${MACHINE_ARCH} == "amd64"
 .  if ${CPUTYPE} == "prescott"
 CPUTYPE = nocona
 .  endif
 . endif
 
 ###############################################################################
 # Logic to set up correct gcc optimization flag.  This must be included
 # after /etc/make.conf so it can react to the local value of CPUTYPE
 # defined therein.  Consult:
 #	http://gcc.gnu.org/onlinedocs/gcc/DEC-Alpha-Options.html
 #	http://gcc.gnu.org/onlinedocs/gcc/IA-64-Options.html
 #	http://gcc.gnu.org/onlinedocs/gcc/RS-6000-and-PowerPC-Options.html
 #	http://gcc.gnu.org/onlinedocs/gcc/SPARC-Options.html
 #	http://gcc.gnu.org/onlinedocs/gcc/i386-and-x86-64-Options.html
 
 . if ${MACHINE_ARCH} == "i386"
 .  if ${CPUTYPE} == "crusoe"
 _CPUCFLAGS = -march=i686 -falign-functions=0 -falign-jumps=0 -falign-loops=0
 .  elif ${CPUTYPE} == "k5"
 _CPUCFLAGS = -march=pentium
 .  else
 _CPUCFLAGS = -march=${CPUTYPE}
 .  endif # GCC on 'i386'
 .  if ${CPUTYPE} == "crusoe"
 _ICC_CPUCFLAGS = -tpp6 -xiM
 .  elif ${CPUTYPE} == "athlon-mp" || ${CPUTYPE} == "athlon-xp" || \
     ${CPUTYPE} == "athlon-4"
 _ICC_CPUCFLAGS = -tpp6 -xiMK
 .  elif ${CPUTYPE} == "athlon-tbird" || ${CPUTYPE} == "athlon"
 _ICC_CPUCFLAGS = -tpp6 -xiM
 .  elif ${CPUTYPE} == "k6-3" || ${CPUTYPE} == "k6-2" || ${CPUTYPE} == "k6"
 _ICC_CPUCFLAGS = -tpp6 -xi
 .  elif ${CPUTYPE} == "k5"
 _ICC_CPUCFLAGS = -tpp5
 .  elif ${CPUTYPE} == "pentium4" || ${CPUTYPE} == "pentium4m"
 _ICC_CPUCFLAGS = -tpp7 -xiMKW
 .  elif ${CPUTYPE} == "pentium3" || ${CPUTYPE} == "pentium3m" || \
      ${CPUTYPE} == "pentium-m"
 _ICC_CPUCFLAGS = -tpp6 -xiMK
 .  elif ${CPUTYPE} == "pentium2" || ${CPUTYPE} == "pentiumpro"
 _ICC_CPUCFLAGS = -tpp6 -xiM
 .  elif ${CPUTYPE} == "pentium-mmx"
 _ICC_CPUCFLAGS = -tpp5 -xM
 .  elif ${CPUTYPE} == "pentium"
 _ICC_CPUCFLAGS = -tpp5
 .  else
 _ICC_CPUCFLAGS =
 .  endif # ICC on 'i386'
 . elif ${MACHINE_ARCH} == "alpha"
 _CPUCFLAGS = -mcpu=${CPUTYPE}
 . elif ${MACHINE_ARCH} == "amd64"
 _CPUCFLAGS = -march=${CPUTYPE}
 . elif ${MACHINE_ARCH} == "arm"
 .  if ${CPUTYPE} == "xscale"
 #XXX: gcc doesn't seem to like -mcpu=xscale, and dies while rebuilding itself
 #_CPUCFLAGS = -mcpu=xscale
 _CPUCFLAGS = -march=armv5te -D__XSCALE__
 .  else
 _CPUCFLAGS = -mcpu=${CPUTYPE}
 .  endif
 . endif
 
 # Set up the list of CPU features based on the CPU type.  This is an
 # unordered list to make it easy for client makefiles to test for the
 # presence of a CPU feature.
 
 . if ${MACHINE_ARCH} == "i386"
 .  if ${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"
 MACHINE_CPU = athlon-xp athlon k7 3dnow sse mmx k6 k5 i586 i486 i386
 .  elif ${CPUTYPE} == "athlon" || ${CPUTYPE} == "athlon-tbird"
 MACHINE_CPU = athlon k7 3dnow mmx k6 k5 i586 i486 i386
 .  elif ${CPUTYPE} == "k6-3" || ${CPUTYPE} == "k6-2"
 MACHINE_CPU = 3dnow mmx k6 k5 i586 i486 i386
 .  elif ${CPUTYPE} == "k6"
 MACHINE_CPU = mmx k6 k5 i586 i486 i386
 .  elif ${CPUTYPE} == "k5"
 MACHINE_CPU = k5 i586 i486 i386
+.  elif ${CPUTYPE} == "c3"
+MACHINE_CPU = 3dnow mmx i586 i486 i386
+.  elif ${CPUTYPE} == "c3-2"
+MACHINE_CPU = sse mmx i586 i486 i386
 .  elif ${CPUTYPE} == "pentium4" || ${CPUTYPE} == "pentium4m" || ${CPUTYPE} == "pentium-m"
 MACHINE_CPU = sse2 sse i686 mmx i586 i486 i386
 .  elif ${CPUTYPE} == "pentium3" || ${CPUTYPE} == "pentium3m"
 MACHINE_CPU = sse i686 mmx i586 i486 i386
 .  elif ${CPUTYPE} == "pentium2"
 MACHINE_CPU = i686 mmx i586 i486 i386
 .  elif ${CPUTYPE} == "pentiumpro"
 MACHINE_CPU = i686 i586 i486 i386
 .  elif ${CPUTYPE} == "pentium-mmx"
 MACHINE_CPU = mmx i586 i486 i386
 .  elif ${CPUTYPE} == "pentium"
 MACHINE_CPU = i586 i486 i386
 .  elif ${CPUTYPE} == "i486"
 MACHINE_CPU = i486 i386
 .  elif ${CPUTYPE} == "i386"
 MACHINE_CPU = i386
 .  endif
 . elif ${MACHINE_ARCH} == "alpha"
 .  if ${CPUTYPE} == "ev67"
 MACHINE_CPU = ev67 ev6 ev56 pca56 ev5 ev45 ev4
 .  elif ${CPUTYPE} == "ev6"
 MACHINE_CPU = ev6 ev56 pca56 ev5 ev45 ev4
 .  elif ${CPUTYPE} == "pca56"
 MACHINE_CPU = pca56 ev56 ev5 ev45 ev4
 .  elif ${CPUTYPE} == "ev56"
 MACHINE_CPU = ev56 ev5 ev45 ev4
 .  elif ${CPUTYPE} == "ev5"
 MACHINE_CPU = ev5 ev45 ev4
 .  elif ${CPUTYPE} == "ev45"
 MACHINE_CPU = ev45 ev4
 .  elif ${CPUTYPE} == "ev4"
 MACHINE_CPU = ev4
 .  endif
 . elif ${MACHINE_ARCH} == "amd64"
 .  if ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || ${CPUTYPE} == "k8"
 MACHINE_CPU = k8 3dnow
 .  elif ${CPUTYPE} == "nocona"
 MACHINE_CPU = sse3
 .  endif
 MACHINE_CPU += amd64 sse2 sse mmx
 . elif ${MACHINE_ARCH} == "ia64"
 .  if ${CPUTYPE} == "itanium"
 MACHINE_CPU = itanium
 .  endif
 . endif
 .endif
 
 .if ${MACHINE_ARCH} == "alpha"
 _CPUCFLAGS += -mieee
 .endif
 
 # NB: COPTFLAGS is handled in /usr/src/sys/conf/kern.pre.mk
 
 .if !defined(NO_CPU_CFLAGS)
 . if ${CC} == "icc"
 CFLAGS += ${_ICC_CPUCFLAGS}
 . else
 CFLAGS += ${_CPUCFLAGS}
 . endif
 .endif