Index: head/share/examples/etc/make.conf
===================================================================
--- head/share/examples/etc/make.conf	(revision 345386)
+++ head/share/examples/etc/make.conf	(revision 345387)
@@ -1,281 +1,282 @@
 # $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 cc.
 # 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)	amdfam10, opteron-sse3, athlon64-sse3, k8-sse3,
 #			opteron, athlon64, athlon-fx, k8, athlon-mp,
 #			athlon-xp, athlon-4, athlon-tbird, athlon, k7,
 #			geode, k6-3, k6-2, k6
 #       (Intel CPUs)	core2, core, nocona, pentium4m, pentium4, prescott,
 #			pentium3m, pentium3, pentium-m, pentium2,
 #			pentiumpro, pentium-mmx, pentium, i486
 #       (VIA CPUs)	c7, c3-2, c3
 #   AMD64 architecture:	amdfam10, opteron-sse3, athlon64-sse3, k8-sse3,
 #			opteron, athlon64, k8, core2, nocona
 #   SPARC-V9 architecture:	v9 (generic 64-bit V9), ultrasparc (default
 #				if omitted), ultrasparc3
 # Additionally the following CPU types are recognized by clang:
 #   Intel x86 architecture (for both amd64 and i386):
 #       (AMD CPUs)	znver1, bdver4, bdver3, bdver2, bdver1, btver2, btver1
-#       (Intel CPUs)	cannonlake, knm, skylake-avx512, knl, goldmont,
+#       (Intel CPUs)	tremont, goldmont-plus, icelake-server, icelake-client,
+#			cannonlake, knm, skylake-avx512, knl, goldmont,
 #			skylake, broadwell, haswell, ivybridge,
 #			sandybridge, westmere, nehalem, silvermont, bonnell
 #
 # (?= allows to buildworld for a different CPUTYPE.)
 #
 #CPUTYPE?=pentium3
 #NO_CPU_CFLAGS=		# Don't add -march=<cpu> to CFLAGS 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
 # before submitting bug reports without patches to the developers.
 #
 # CFLAGS.arch provides a mechanism for applying CFLAGS only when building
 # the given architecture.  This is useful primarily on a system used for
 # cross-building, when you have a set of flags to apply to the TARGET_ARCH
 # being cross-built but don't want those settings applied to building the
 # cross-tools or other components that run on the build host machine.
 #
 # 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.
 #
 # Additional compiler flags can be specified that extend or override
 # default ones. However, neither the base system nor ports are guaranteed
 # to build and function without problems with non-default settings.
 #
 # CFLAGS+=	-msse3
 # CXXFLAGS+=	-msse3
 # CFLAGS.armv6+= -mfloat-abi=softfp
 #
 # 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+= -C
 #
 # Mtree will follow symlinks.
 #MTREE_FOLLOWS_SYMLINKS= -L
 #
 # 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:
 #
 #WITHOUT_MANCOMPRESS=t
 #
 #
 # 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/stand 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=
 #
 #
 # 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=
 #
 #
 # It is also possible to set variables in make.conf which will only be
 # used when compiling a specific port.  For more details see make(1).
 #
 #.if ${.CURDIR:M*/irc/irssi-devel*}
 #WITH_DEBUG=YES
 #.endif
 #
 # Another approach is to use /usr/ports/ports-mgmt/portconf which has
 # its own config file for port specific options.
Index: head/share/mk/bsd.cpu.mk
===================================================================
--- head/share/mk/bsd.cpu.mk	(revision 345386)
+++ head/share/mk/bsd.cpu.mk	(revision 345387)
@@ -1,406 +1,412 @@
 # $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_CPUARCH} == "aarch64"
 MACHINE_CPU = arm64
 . elif ${MACHINE_CPUARCH} == "amd64"
 MACHINE_CPU = amd64 sse2 sse mmx
 . elif ${MACHINE_CPUARCH} == "arm"
 MACHINE_CPU = arm
 . elif ${MACHINE_CPUARCH} == "i386"
 MACHINE_CPU = i486
 . elif ${MACHINE_CPUARCH} == "mips"
 MACHINE_CPU = mips
 . elif ${MACHINE_CPUARCH} == "powerpc"
 MACHINE_CPU = aim
 . elif ${MACHINE_CPUARCH} == "riscv"
 MACHINE_CPU = riscv
 . elif ${MACHINE_CPUARCH} == "sparc64"
 MACHINE_CPU = ultrasparc
 . endif
 .else
 
 # Handle aliases (not documented in make.conf to avoid user confusion
 # between e.g. i586 and pentium)
 
 . if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
 .  if ${CPUTYPE} == "barcelona"
 CPUTYPE = amdfam10
+.  elif ${CPUTYPE} == "skx"
+CPUTYPE = skylake-avx512
 .  elif ${CPUTYPE} == "core-avx2"
 CPUTYPE = haswell
 .  elif ${CPUTYPE} == "core-avx-i"
 CPUTYPE = ivybridge
 .  elif ${CPUTYPE} == "corei7-avx"
 CPUTYPE = sandybridge
 .  elif ${CPUTYPE} == "corei7"
 CPUTYPE = nehalem
 .  elif ${CPUTYPE} == "slm"
 CPUTYPE = silvermont
 .  elif ${CPUTYPE} == "atom"
 CPUTYPE = bonnell
 .  elif ${CPUTYPE} == "core"
 CPUTYPE = prescott
 .  endif
 .  if ${MACHINE_CPUARCH} == "amd64"
 .   if ${CPUTYPE} == "prescott"
 CPUTYPE = nocona
 .   endif
 .  else
 .   if ${CPUTYPE} == "k7"
 CPUTYPE = athlon
 .   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
 .   endif
 .  endif
 . elif ${MACHINE_ARCH} == "sparc64"
 .  if ${CPUTYPE} == "us"
 CPUTYPE = ultrasparc
 .  elif ${CPUTYPE} == "us3"
 CPUTYPE = ultrasparc3
 .  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/ARM-Options.html
 #	http://gcc.gnu.org/onlinedocs/gcc/RS-6000-and-PowerPC-Options.html
 #	http://gcc.gnu.org/onlinedocs/gcc/MIPS-Options.html
 #	http://gcc.gnu.org/onlinedocs/gcc/SPARC-Options.html
 #	http://gcc.gnu.org/onlinedocs/gcc/i386-and-x86_002d64-Options.html
 
 . if ${MACHINE_CPUARCH} == "i386"
 .  if ${CPUTYPE} == "crusoe"
 _CPUCFLAGS = -march=i686 -falign-functions=0 -falign-jumps=0 -falign-loops=0
 .  elif ${CPUTYPE} == "k5"
 _CPUCFLAGS = -march=pentium
 .  elif ${CPUTYPE} == "c7"
 _CPUCFLAGS = -march=c3-2
 .  else
 _CPUCFLAGS = -march=${CPUTYPE}
 .  endif
 . elif ${MACHINE_CPUARCH} == "amd64"
 _CPUCFLAGS = -march=${CPUTYPE}
 . elif ${MACHINE_CPUARCH} == "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__
 .  elif ${CPUTYPE:M*soft*} != ""
 _CPUCFLAGS = -mfloat-abi=softfp
 .  elif ${CPUTYPE} == "cortexa"
 _CPUCFLAGS = -march=armv7 -mfpu=vfp
 .  elif ${CPUTYPE:Marmv[4567]*} != ""
 # Handle all the armvX types that FreeBSD runs:
 #	armv4, armv4t, armv5, armv5te, armv6, armv6t2, armv7, armv7-a, armv7ve
 # they require -march=. All the others require -mcpu=.
 _CPUCFLAGS = -march=${CPUTYPE}
 .  else
 # Common values for FreeBSD
 # arm: (any arm v4 or v5 processor you are targeting)
 #	arm920t, arm926ej-s, marvell-pj4, fa526, fa626,
 #	fa606te, fa626te, fa726te
 # armv6: (any arm v7 or v8 processor you are targeting and the arm1176jzf-s)
 # 	arm1176jzf-s, generic-armv7-a, cortex-a5, cortex-a7, cortex-a8,
 #	cortex-a9, cortex-a12, cortex-a15, cortex-a17, cortex-a53, cortex-a57,
 #	cortex-a72, exynos-m1
 _CPUCFLAGS = -mcpu=${CPUTYPE}
 . endif
 . elif ${MACHINE_ARCH} == "powerpc"
 .  if ${CPUTYPE} == "e500"
 _CPUCFLAGS = -Wa,-me500 -msoft-float
 .  else
 _CPUCFLAGS = -mcpu=${CPUTYPE} -mno-powerpc64
 .  endif
 . elif ${MACHINE_ARCH} == "powerpcspe"
 _CPUCFLAGS = -Wa,-me500 -mspe=yes -mabi=spe -mfloat-gprs=double -mcpu=8548
 . elif ${MACHINE_ARCH} == "powerpc64"
 _CPUCFLAGS = -mcpu=${CPUTYPE}
 . elif ${MACHINE_CPUARCH} == "mips"
 # mips[1234], mips32, mips64, and all later releases need to have mips
 # preserved (releases later than r2 require external toolchain)
 .  if ${CPUTYPE:Mmips32*} != "" || ${CPUTYPE:Mmips64*} != "" || \
 	${CPUTYPE:Mmips[1234]} != ""
 _CPUCFLAGS = -march=${CPUTYPE}
 . else
 # Default -march to the CPUTYPE passed in, with mips stripped off so we
 # accept either mips4kc or 4kc, mostly for historical reasons
 # Typical values for cores:
 #	4kc, 24kc, 34kc, 74kc, 1004kc, octeon, octeon+, octeon2, octeon3,
 #	sb1, xlp, xlr
 _CPUCFLAGS = -march=${CPUTYPE:S/^mips//}
 . endif
 . elif ${MACHINE_ARCH} == "sparc64"
 .  if ${CPUTYPE} == "v9"
 _CPUCFLAGS = -mcpu=v9
 .  elif ${CPUTYPE} == "ultrasparc"
 _CPUCFLAGS = -mcpu=ultrasparc
 .  elif ${CPUTYPE} == "ultrasparc3"
 _CPUCFLAGS = -mcpu=ultrasparc3
 .  endif
 . elif ${MACHINE_CPUARCH} == "aarch64"
 _CPUCFLAGS = -mcpu=${CPUTYPE}
 . 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.
 
 ########## i386
 . if ${MACHINE_CPUARCH} == "i386"
 .  if ${CPUTYPE} == "znver1"
 MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586
 .  elif ${CPUTYPE} == "bdver4"
 MACHINE_CPU = xop avx2 avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586
 .  elif ${CPUTYPE} == "bdver3" || ${CPUTYPE} == "bdver2" || \
     ${CPUTYPE} == "bdver1"
 MACHINE_CPU = xop avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586
 .  elif ${CPUTYPE} == "btver2"
 MACHINE_CPU = avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586
 .  elif ${CPUTYPE} == "btver1"
 MACHINE_CPU = ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586
 .  elif ${CPUTYPE} == "amdfam10"
 MACHINE_CPU = athlon-xp athlon k7 3dnow sse4a sse3 sse2 sse mmx k6 k5 i586
 .  elif ${CPUTYPE} == "opteron-sse3" || ${CPUTYPE} == "athlon64-sse3"
 MACHINE_CPU = athlon-xp athlon k7 3dnow sse3 sse2 sse mmx k6 k5 i586
 .  elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || \
     ${CPUTYPE} == "athlon-fx"
 MACHINE_CPU = athlon-xp athlon k7 3dnow sse2 sse mmx k6 k5 i586
 .  elif ${CPUTYPE} == "athlon-mp" || ${CPUTYPE} == "athlon-xp" || \
     ${CPUTYPE} == "athlon-4"
 MACHINE_CPU = athlon-xp athlon k7 3dnow sse mmx k6 k5 i586
 .  elif ${CPUTYPE} == "athlon" || ${CPUTYPE} == "athlon-tbird"
 MACHINE_CPU = athlon k7 3dnow mmx k6 k5 i586
 .  elif ${CPUTYPE} == "k6-3" || ${CPUTYPE} == "k6-2" || ${CPUTYPE} == "geode"
 MACHINE_CPU = 3dnow mmx k6 k5 i586
 .  elif ${CPUTYPE} == "k6"
 MACHINE_CPU = mmx k6 k5 i586
 .  elif ${CPUTYPE} == "k5"
 MACHINE_CPU = k5 i586
-.  elif ${CPUTYPE} == "cannonlake" || ${CPUTYPE} == "knm" || \
+.  elif ${CPUTYPE} == "icelake-server" || ${CPUTYPE} == "icelake-client" || \
+    ${CPUTYPE} == "cannonlake" || ${CPUTYPE} == "knm" || \
     ${CPUTYPE} == "skylake-avx512" || ${CPUTYPE} == "knl"
 MACHINE_CPU = avx512 avx2 avx sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586
 .  elif ${CPUTYPE} == "skylake" || ${CPUTYPE} == "broadwell" || \
     ${CPUTYPE} == "haswell"
 MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586
 .  elif ${CPUTYPE} == "ivybridge" || ${CPUTYPE} == "sandybridge"
 MACHINE_CPU = avx sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586
-.  elif ${CPUTYPE} == "goldmont" || ${CPUTYPE} == "westmere" || \
+.  elif ${CPUTYPE} == "tremont" || ${CPUTYPE} == "goldmont-plus" || \
+    ${CPUTYPE} == "goldmont" || ${CPUTYPE} == "westmere" || \
     ${CPUTYPE} == "nehalem" || ${CPUTYPE} == "silvermont"
 MACHINE_CPU = sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586
 .  elif ${CPUTYPE} == "penryn"
 MACHINE_CPU = sse41 ssse3 sse3 sse2 sse i686 mmx i586
 .  elif ${CPUTYPE} == "core2" || ${CPUTYPE} == "bonnell"
 MACHINE_CPU = ssse3 sse3 sse2 sse i686 mmx i586
 .  elif ${CPUTYPE} == "yonah" || ${CPUTYPE} == "prescott"
 MACHINE_CPU = sse3 sse2 sse i686 mmx i586
 .  elif ${CPUTYPE} == "pentium4" || ${CPUTYPE} == "pentium4m" || \
     ${CPUTYPE} == "pentium-m"
 MACHINE_CPU = sse2 sse i686 mmx i586
 .  elif ${CPUTYPE} == "pentium3" || ${CPUTYPE} == "pentium3m"
 MACHINE_CPU = sse i686 mmx i586
 .  elif ${CPUTYPE} == "pentium2"
 MACHINE_CPU = i686 mmx i586
 .  elif ${CPUTYPE} == "pentiumpro"
 MACHINE_CPU = i686 i586
 .  elif ${CPUTYPE} == "pentium-mmx"
 MACHINE_CPU = mmx i586
 .  elif ${CPUTYPE} == "pentium"
 MACHINE_CPU = i586
 .  elif ${CPUTYPE} == "c7"
 MACHINE_CPU = sse3 sse2 sse i686 mmx i586
 .  elif ${CPUTYPE} == "c3-2"
 MACHINE_CPU = sse i686 mmx i586
 .  elif ${CPUTYPE} == "c3"
 MACHINE_CPU = 3dnow mmx i586
 .  elif ${CPUTYPE} == "winchip2"
 MACHINE_CPU = 3dnow mmx
 .  elif ${CPUTYPE} == "winchip-c6"
 MACHINE_CPU = mmx
 .  endif
 MACHINE_CPU += i486
 ########## amd64
 . elif ${MACHINE_CPUARCH} == "amd64"
 .  if ${CPUTYPE} == "znver1"
 MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse4a sse3
 .  elif ${CPUTYPE} == "bdver4"
 MACHINE_CPU = xop avx2 avx sse42 sse41 ssse3 sse4a sse3
 .  elif ${CPUTYPE} == "bdver3" || ${CPUTYPE} == "bdver2" || \
     ${CPUTYPE} == "bdver1"
 MACHINE_CPU = xop avx sse42 sse41 ssse3 sse4a sse3
 .  elif ${CPUTYPE} == "btver2"
 MACHINE_CPU = avx sse42 sse41 ssse3 sse4a sse3
 .  elif ${CPUTYPE} == "btver1"
 MACHINE_CPU = ssse3 sse4a sse3
 .  elif ${CPUTYPE} == "amdfam10"
 MACHINE_CPU = k8 3dnow sse4a sse3
 .  elif ${CPUTYPE} == "opteron-sse3" || ${CPUTYPE} == "athlon64-sse3" || \
     ${CPUTYPE} == "k8-sse3"
 MACHINE_CPU = k8 3dnow sse3
 .  elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || \
     ${CPUTYPE} == "athlon-fx" || ${CPUTYPE} == "k8"
 MACHINE_CPU = k8 3dnow
-.  elif ${CPUTYPE} == "cannonlake" || ${CPUTYPE} == "knm" || \
+.  elif ${CPUTYPE} == "icelake-server" || ${CPUTYPE} == "icelake-client" || \
+    ${CPUTYPE} == "cannonlake" || ${CPUTYPE} == "knm" || \
     ${CPUTYPE} == "skylake-avx512" || ${CPUTYPE} == "knl"
 MACHINE_CPU = avx512 avx2 avx sse42 sse41 ssse3 sse3
 .  elif ${CPUTYPE} == "skylake" || ${CPUTYPE} == "broadwell" || \
     ${CPUTYPE} == "haswell"
 MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse3
 .  elif ${CPUTYPE} == "ivybridge" || ${CPUTYPE} == "sandybridge"
 MACHINE_CPU = avx sse42 sse41 ssse3 sse3
-.  elif ${CPUTYPE} == "goldmont" || ${CPUTYPE} == "westmere" || \
+.  elif ${CPUTYPE} == "tremont" || ${CPUTYPE} == "goldmont-plus" || \
+    ${CPUTYPE} == "goldmont" || ${CPUTYPE} == "westmere" || \
     ${CPUTYPE} == "nehalem" || ${CPUTYPE} == "silvermont"
 MACHINE_CPU = sse42 sse41 ssse3 sse3
 .  elif ${CPUTYPE} == "penryn"
 MACHINE_CPU = sse41 ssse3 sse3
 .  elif ${CPUTYPE} == "core2" || ${CPUTYPE} == "bonnell"
 MACHINE_CPU = ssse3 sse3
 .  elif ${CPUTYPE} == "nocona"
 MACHINE_CPU = sse3
 .  endif
 MACHINE_CPU += amd64 sse2 sse mmx
 ########## Mips
 . elif ${MACHINE_CPUARCH} == "mips"
 MACHINE_CPU = mips
 ########## powerpc
 . elif ${MACHINE_ARCH} == "powerpc"
 .  if ${CPUTYPE} == "e500"
 MACHINE_CPU = booke softfp
 .  endif
 ########## riscv
 . elif ${MACHINE_CPUARCH} == "riscv"
 MACHINE_CPU = riscv
 ########## sparc64
 . 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
 
 .if ${MACHINE_CPUARCH} == "mips"
 CFLAGS += -G0
 . if ${MACHINE_ARCH:Mmips*el*} != ""
 AFLAGS += -EL
 CFLAGS += -EL
 LDFLAGS += -EL
 . else
 AFLAGS += -EB
 CFLAGS += -EB
 LDFLAGS += -EB
 . endif
 . if ${MACHINE_ARCH:Mmips64*} != ""
 AFLAGS+= -mabi=64
 CFLAGS+= -mabi=64
 LDFLAGS+= -mabi=64
 . elif ${MACHINE_ARCH:Mmipsn32*} != ""
 AFLAGS+= -mabi=n32
 CFLAGS+= -mabi=n32
 LDFLAGS+= -mabi=n32
 . else
 AFLAGS+= -mabi=32
 CFLAGS+= -mabi=32
 LDFLAGS+= -mabi=32
 . endif
 . if ${MACHINE_ARCH:Mmips*hf}
 CFLAGS += -mhard-float
 . else
 CFLAGS += -msoft-float
 . endif
 .endif
 
 ########## arm
 .if ${MACHINE_CPUARCH} == "arm"
 MACHINE_CPU += arm
 . if ${MACHINE_ARCH:Marmv6*} != ""
 MACHINE_CPU += armv6
 . endif
 . if ${MACHINE_ARCH:Marmv7*} != ""
 MACHINE_CPU += armv7
 . endif
 # armv6 and armv7 are a hybrid. It can use the softfp ABI, but doesn't emulate
 # floating point in the general case, so don't define softfp for it at this
 # time. arm is pure softfp, so define it for them.
 . if ${MACHINE_ARCH:Marmv[67]*} == ""
 MACHINE_CPU += softfp
 . endif
 # Normally armv6 and armv7 are hard float ABI from FreeBSD 11 onwards. However
 # when CPUTYPE has 'soft' in it, we use the soft-float ABI to allow building of
 # soft-float ABI libraries. In this case, we have to add the -mfloat-abi=softfp
 # to force that.
 .if ${MACHINE_ARCH:Marmv[67]*} && defined(CPUTYPE) && ${CPUTYPE:M*soft*} != ""
 # Needs to be CFLAGS not _CPUCFLAGS because it's needed for the ABI
 # not a nice optimization.
 CFLAGS += -mfloat-abi=softfp
 .endif
 .endif
 
 .if ${MACHINE_ARCH} == "powerpcspe"
 CFLAGS += -mcpu=8548 -Wa,-me500 -mspe=yes -mabi=spe -mfloat-gprs=double
 .endif
 
 .if ${MACHINE_CPUARCH} == "riscv"
 .if ${MACHINE_ARCH:Mriscv*sf}
 CFLAGS += -march=rv64imac -mabi=lp64
 .else
 CFLAGS += -march=rv64imafdc -mabi=lp64d
 .endif
 .endif
 
 # NB: COPTFLAGS is handled in /usr/src/sys/conf/kern.pre.mk
 
 .if !defined(NO_CPU_CFLAGS)
 CFLAGS += ${_CPUCFLAGS}
 .endif
 
 #
 # Prohibit the compiler from emitting SIMD instructions.
 # These flags are added to CFLAGS in areas where the extra context-switch
 # cost outweighs the advantages of SIMD instructions.
 #
 # gcc:
 # Setting -mno-mmx implies -mno-3dnow
 # Setting -mno-sse implies -mno-sse2, -mno-sse3, -mno-ssse3 and -mfpmath=387
 #
 # clang:
 # Setting -mno-mmx implies -mno-3dnow and -mno-3dnowa
 # Setting -mno-sse implies -mno-sse2, -mno-sse3, -mno-ssse3, -mno-sse41 and
 # -mno-sse42
 # (-mfpmath= is not supported)
 #
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 CFLAGS_NO_SIMD.clang= -mno-avx -mno-avx2
 CFLAGS_NO_SIMD= -mno-mmx -mno-sse
 .endif
 CFLAGS_NO_SIMD += ${CFLAGS_NO_SIMD.${COMPILER_TYPE}}
 
 # Add in any architecture-specific CFLAGS.
 # These come from make.conf or the command line or the environment.
 CFLAGS += ${CFLAGS.${MACHINE_ARCH}}
 CXXFLAGS += ${CXXFLAGS.${MACHINE_ARCH}}