Date: Mon, 14 Jun 2021 22:44:58 GMT From: Jung-uk Kim <jkim@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 09e7341c5ea4 - main - Catch up with Clang 12. Message-ID: <202106142244.15EMiwI2061033@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=09e7341c5ea40120bd1850c48c44bfbae5475f3f commit 09e7341c5ea40120bd1850c48c44bfbae5475f3f Author: Jung-uk Kim <jkim@FreeBSD.org> AuthorDate: 2021-06-14 22:42:59 +0000 Commit: Jung-uk Kim <jkim@FreeBSD.org> CommitDate: 2021-06-14 22:42:59 +0000 Catch up with Clang 12. Add "znver3" for AMD and "alderlake" and "sapphirerapids" for Intel. --- share/examples/etc/make.conf | 18 +++++++++--------- share/mk/bsd.cpu.mk | 12 ++++++++---- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index c40a35c0f868..dbb776e7df14 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -30,19 +30,19 @@ # NO_CPU_CFLAGS variable below. # Currently the following CPU types are recognized: # Intel x86 architecture: -# (AMD CPUs) znver2, znver1, bdver4, bdver3, bdver2, bdver1, +# (AMD CPUs) znver3, znver2, znver1, bdver4, bdver3, bdver2, bdver1, # btver2, btver1, 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) tigerlake, cooperlake, cascadelake, tremont, -# goldmont-plus, icelake-server, icelake-client, -# cannonlake, knm, skylake-avx512, knl, goldmont, -# skylake, broadwell, haswell, ivybridge, sandybridge, -# westmere, nehalem, silvermont, bonnell, core2, core, -# nocona, pentium4m, pentium4, prescott, pentium3m, -# pentium3, pentium-m, pentium2, pentiumpro, pentium-mmx, -# pentium, i486 +# (Intel CPUs) alderlake, sapphirerapids, tigerlake, cooperlake, +# cascadelake, tremont, goldmont-plus, icelake-server, +# icelake-client, cannonlake, knm, skylake-avx512, knl, +# goldmont, skylake, broadwell, haswell, ivybridge, +# sandybridge, westmere, nehalem, silvermont, bonnell, +# core2, core, nocona, pentium4m, pentium4, prescott, +# pentium3m, pentium3, pentium-m, pentium2, pentiumpro, +# pentium-mmx, pentium, i486 # (VIA CPUs) c7, c3-2, c3 # ARM architecture: armv5, armv5te, armv6, armv6t2, arm1176jzf-s, armv7, # armv7-a, armv7ve, generic-armv7-a, cortex-a5, diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index cc907d79d03e..c4ca930b74ec 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -160,7 +160,8 @@ _CPUCFLAGS = -mcpu=${CPUTYPE} ########## i386 . if ${MACHINE_CPUARCH} == "i386" -. if ${CPUTYPE} == "znver2" || ${CPUTYPE} == "znver1" +. if ${CPUTYPE} == "znver3" || ${CPUTYPE} == "znver2" || \ + ${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 @@ -189,7 +190,8 @@ MACHINE_CPU = 3dnow mmx k6 k5 i586 MACHINE_CPU = mmx k6 k5 i586 . elif ${CPUTYPE} == "k5" MACHINE_CPU = k5 i586 -. elif ${CPUTYPE} == "tigerlake" || ${CPUTYPE} == "cooperlake" || \ +. elif ${CPUTYPE} == "alderlake" || ${CPUTYPE} == "sapphirerapids" || \ + ${CPUTYPE} == "tigerlake" || ${CPUTYPE} == "cooperlake" || \ ${CPUTYPE} == "cascadelake" || ${CPUTYPE} == "icelake-server" || \ ${CPUTYPE} == "icelake-client" || ${CPUTYPE} == "cannonlake" || \ ${CPUTYPE} == "knm" || ${CPUTYPE} == "skylake-avx512" || ${CPUTYPE} == "knl" @@ -236,7 +238,8 @@ MACHINE_CPU = mmx MACHINE_CPU += i486 ########## amd64 . elif ${MACHINE_CPUARCH} == "amd64" -. if ${CPUTYPE} == "znver2" || ${CPUTYPE} == "znver1" +. if ${CPUTYPE} == "znver3" || ${CPUTYPE} == "znver2" || \ + ${CPUTYPE} == "znver1" MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse4a sse3 . elif ${CPUTYPE} == "bdver4" MACHINE_CPU = xop avx2 avx sse42 sse41 ssse3 sse4a sse3 @@ -255,7 +258,8 @@ MACHINE_CPU = k8 3dnow sse3 . elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || \ ${CPUTYPE} == "athlon-fx" || ${CPUTYPE} == "k8" MACHINE_CPU = k8 3dnow -. elif ${CPUTYPE} == "tigerlake" || ${CPUTYPE} == "cooperlake" || \ +. elif ${CPUTYPE} == "alderlake" || ${CPUTYPE} == "sapphirerapids" || \ + ${CPUTYPE} == "tigerlake" || ${CPUTYPE} == "cooperlake" || \ ${CPUTYPE} == "cascadelake" || ${CPUTYPE} == "icelake-server" || \ ${CPUTYPE} == "icelake-client" || ${CPUTYPE} == "cannonlake" || \ ${CPUTYPE} == "knm" || ${CPUTYPE} == "skylake-avx512" || ${CPUTYPE} == "knl"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106142244.15EMiwI2061033>