Tidy up bsd.cpu.mk for X86 CPUs:

- Do not limit recent processors to "prescott" class for i386 target.  There
is no reason for this hack because clang is default now.  On top of that, it
will only grow indefinitely over time.
- Add more CPUTYPEs, i.e., "athlon-fx", "core-avx2", "atom", "penryn", and
"yonah".  Note "penryn" and "yonah" are intentionally undocumented because
they are not supported by gcc and marked deprecated by clang.
- Add more CPUTYPE aliases, i.e., "barcelona" (-> amdfam10), "westmere" and
"nehalem" (-> corei7).  Note these are intentionally undocumented because
they are not supported by (base) gcc and/or clang.  However, LLVM (backend)
seems to "know" the differences.  Most likely, they were deprecated with
other vendor code names and clang did not bother implementing them at all.
- Add i686 to MACHINE_CPU for "c3-2" (VIA Nehemiah).  Both gcc & clang treat
it like an i686-class processor.
- Add IDT "winchip2" and "winchip-c6" for completeness (undocumented).
- Order processors per make.conf example, i.e., CPU vendors and models.
- Tidy up make.conf example, i.e., remove "by gcc" (because we have aliases)
and remove "prescott" from AMD64 architecture (because it is not correct).

1 files changed, 6 insertions, 5 deletions

diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 6ba5a4e..df5e225 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -28,24 +28,25 @@
 # 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 by gcc:
+# Currently the following CPU types are recognized:
 #   Intel x86 architecture:
 #       (AMD CPUs)	opteron-sse3, athlon64-sse3, k8-sse3, opteron,
-#			athlon64, k8, athlon-mp, athlon-xp, athlon-4,
-#			athlon-tbird, athlon, k7, geode, k6-3, k6-2, k6, k5
+#			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:	opteron-sse3, athlon64-sse3, k8-sse3, opteron,
-#			athlon64, k8, core2, nocona, prescott
+#			athlon64, k8, core2, nocona
 #   Intel ia64 architecture:	itanium2, itanium
 #   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)	bdver2, bdver1, btver1, amdfam10
-#       (Intel CPUs)	core-avx-i, corei7-avx, corei7
+#       (Intel CPUs)	core-avx2, core-avx-i, corei7-avx, corei7, atom
 #
 # (?= allows to buildworld for a different CPUTYPE.)
 #