Date: Mon, 19 Nov 2012 23:07:44 +0100 From: Roman Divacky <rdivacky@freebsd.org> To: Jung-uk Kim <jkim@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r243310 - head/share/mk Message-ID: <20121119220744.GA70471@freebsd.org> In-Reply-To: <201211192158.qAJLwEUR048991@svn.freebsd.org> References: <201211192158.qAJLwEUR048991@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Maybe update share/examples/etc/make.conf too? On Mon, Nov 19, 2012 at 09:58:14PM +0000, Jung-uk Kim wrote: > Author: jkim > Date: Mon Nov 19 21:58:14 2012 > New Revision: 243310 > URL: http://svnweb.freebsd.org/changeset/base/243310 > > Log: > Add x86 CPUs supported by clang on head. > > Reviewed by: arch (silence) > X-MFC: r242624 > > Modified: > head/share/mk/bsd.cpu.mk > > Modified: head/share/mk/bsd.cpu.mk > ============================================================================== > --- head/share/mk/bsd.cpu.mk Mon Nov 19 21:11:58 2012 (r243309) > +++ head/share/mk/bsd.cpu.mk Mon Nov 19 21:58:14 2012 (r243310) > @@ -27,9 +27,9 @@ MACHINE_CPU = mips > # between e.g. i586 and pentium) > > . if ${MACHINE_CPUARCH} == "i386" > -. if ${CPUTYPE} == "nocona" > -CPUTYPE = prescott > -. elif ${CPUTYPE} == "core" > +. if ${CPUTYPE} == "nocona" || ${CPUTYPE} == "core" || \ > + ${CPUTYPE} == "core2" || ${CPUTYPE} == "corei7" || \ > + ${CPUTYPE} == "corei7-avx" || ${CPUTYPE} == "core-avx-i" > CPUTYPE = prescott > . elif ${CPUTYPE} == "p4" > CPUTYPE = pentium4 > @@ -50,10 +50,11 @@ CPUTYPE = pentium-mmx > . elif ${CPUTYPE} == "i586" > CPUTYPE = pentium > . elif ${CPUTYPE} == "opteron-sse3" || ${CPUTYPE} == "athlon64-sse3" || \ > - ${CPUTYPE} == "k8-sse3" > + ${CPUTYPE} == "k8-sse3" || ${CPUTYPE} == "amdfam10" || \ > + ${CPUTYPE} == "btver1" || ${CPUTYPE} == "bdver1" || ${CPUTYPE} == "bdver2" > CPUTYPE = prescott > . elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || \ > - ${CPUTYPE} == "k8" > + ${CPUTYPE} == "k8" > CPUTYPE = athlon-mp > . elif ${CPUTYPE} == "k7" > CPUTYPE = athlon > @@ -142,7 +143,15 @@ _CPUCFLAGS = -mcpu=ultrasparc3 > # presence of a CPU feature. > > . if ${MACHINE_CPUARCH} == "i386" > -. if ${CPUTYPE} == "opteron-sse3" || ${CPUTYPE} == "athlon64-sse3" > +. if ${CPUTYPE} == "bdver1" || ${CPUTYPE} == "bdver2" > +MACHINE_CPU = xop avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586 > +MACHINE_CPU += i486 i386 > +. elif ${CPUTYPE} == "btver1" > +MACHINE_CPU = ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586 i486 i386 > +. elif ${CPUTYPE} == "amdfam10" > +MACHINE_CPU = athlon-xp athlon k7 3dnow sse4a sse3 sse2 sse mmx k6 k5 i586 > +MACHINE_CPU += i486 i386 > +. elif ${CPUTYPE} == "opteron-sse3" || ${CPUTYPE} == "athlon64-sse3" > MACHINE_CPU = athlon-xp athlon k7 3dnow sse3 sse2 sse mmx k6 k5 i586 i486 i386 > . elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" > MACHINE_CPU = athlon-xp athlon k7 3dnow sse2 sse mmx k6 k5 i586 i486 i386 > @@ -163,11 +172,16 @@ MACHINE_CPU = 3dnow mmx i586 i486 i386 > MACHINE_CPU = sse mmx i586 i486 i386 > . elif ${CPUTYPE} == "c7" > MACHINE_CPU = sse3 sse2 sse i686 mmx i586 i486 i386 > +. elif ${CPUTYPE} == "corei7-avx" || ${CPUTYPE} == "core-avx-i" > +MACHINE_CPU = avx sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586 i486 i386 > +. elif ${CPUTYPE} == "corei7" > +MACHINE_CPU = sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586 i486 i386 > . elif ${CPUTYPE} == "core2" > MACHINE_CPU = ssse3 sse3 sse2 sse i686 mmx i586 i486 i386 > . elif ${CPUTYPE} == "prescott" > MACHINE_CPU = sse3 sse2 sse i686 mmx i586 i486 i386 > -. elif ${CPUTYPE} == "pentium4" || ${CPUTYPE} == "pentium4m" || ${CPUTYPE} == "pentium-m" > +. 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 > @@ -185,10 +199,22 @@ MACHINE_CPU = i486 i386 > MACHINE_CPU = i386 > . endif > . elif ${MACHINE_CPUARCH} == "amd64" > -. if ${CPUTYPE} == "opteron-sse3" || ${CPUTYPE} == "athlon64-sse3" || ${CPUTYPE} == "k8-sse3" > +. if ${CPUTYPE} == "bdver1" || ${CPUTYPE} == "bdver2" > +MACHINE_CPU = xop 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} == "k8" > +. elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || \ > + ${CPUTYPE} == "k8" > MACHINE_CPU = k8 3dnow > +. elif ${CPUTYPE} == "corei7-avx" || ${CPUTYPE} == "core-avx-i" > +MACHINE_CPU = avx sse42 sse41 ssse3 sse3 > +. elif ${CPUTYPE} == "corei7" > +MACHINE_CPU = sse42 sse41 ssse3 sse3 > . elif ${CPUTYPE} == "core2" > MACHINE_CPU = ssse3 sse3 > . elif ${CPUTYPE} == "nocona"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121119220744.GA70471>