diff options
| author | kris <kris@FreeBSD.org> | 2001-02-27 11:21:47 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2001-02-27 11:21:47 +0000 |
| commit | 23b79b16b0511e36948f04e5ae3140a9286d4256 (patch) | |
| tree | 1359b805e08d2d08fb823c3d040789a96b0ea578 /share | |
| parent | 97a68a0cd38a47db65ec7c4118c5bd4ba6931aff (diff) | |
| download | FreeBSD-src-23b79b16b0511e36948f04e5ae3140a9286d4256.zip FreeBSD-src-23b79b16b0511e36948f04e5ae3140a9286d4256.tar.gz | |
Add definitions and support for the AMD k6-2, Pentium MMX (i586/MMX),
and Pentium II, III and IV processors (p2, p3, p4), as well as 'mmx' and
'3dnow' MACHINE_CPU tags as appropriate. In the near future this will
be used to control various ports which have MMX/3dNow optimizations,
instead of the ad-hoc methods currently used.
Reviewed by: peter
Diffstat (limited to 'share')
| -rw-r--r-- | share/examples/etc/make.conf | 4 | ||||
| -rw-r--r-- | share/mk/bsd.cpu.mk | 22 |
2 files changed, 24 insertions, 2 deletions
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index 8f4ba6f..b5b6e2e 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -21,7 +21,9 @@ # The automatic setting of CFLAGS may be overridden using the # NO_CPU_CFLAGS variable below. # Currently the following CPU types are recognised: -# Intel x86 architecture: k7 k6 k5 i686 i586 i486 i386 +# Intel x86 architecture: +# (AMD CPUs) k7 k6-2 k6 k5 +# (Intel CPUs) p4 p3 p2 i686 i586/mmx i586 i486 i386 # Alpha/AXP architecture: ev6 pca56 ev56 ev5 ev45 ev4 # Intel ia64 architecture: itanium # diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index bbf3080..63937f3 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -32,12 +32,22 @@ CPUTYPE = k7 . if ${MACHINE_ARCH} == "i386" . if ${CPUTYPE} == "k7" CFLAGS += -march=k6 # gcc doesn't support athlon yet, but it will +. elif ${CPUTYPE} == "k6-2" +CFLAGS += -march=k6 . elif ${CPUTYPE} == "k6" CFLAGS += -march=k6 . elif ${CPUTYPE} == "k5" CFLAGS += -march=pentium +. elif ${CPUTYPE} == "p4" +CFLAGS += -march=pentiumpro +. elif ${CPUTYPE} == "p3" +CFLAGS += -march=pentiumpro +. elif ${CPUTYPE} == "p2" +CFLAGS += -march=pentiumpro . elif ${CPUTYPE} == "i686" CFLAGS += -march=pentiumpro +. elif ${CPUTYPE} == "i586/mmx" +CFLAGS += -march=pentium . elif ${CPUTYPE} == "i586" CFLAGS += -march=pentium . elif ${CPUTYPE} == "i486" @@ -66,13 +76,23 @@ CFLAGS += -mcpu=ev4 .if ${MACHINE_ARCH} == "i386" . if ${CPUTYPE} == "k7" -MACHINE_CPU = k7 k6 k5 i586 i486 i386 +MACHINE_CPU = k7 3dnow k6 k5 i586 i486 i386 +. elif ${CPUTYPE} == "k6-2" +MACHINE_CPU = 3dnow k6 k5 i586 i486 i386 . elif ${CPUTYPE} == "k6" MACHINE_CPU = k6 k5 i586 i486 i386 . elif ${CPUTYPE} == "k5" MACHINE_CPU = k5 i586 i486 i386 +. elif ${CPUTYPE} == "p4" +MACHINE_CPU = sse i686 mmx i586 i486 i386 +. elif ${CPUTYPE} == "p3" +MACHINE_CPU = sse i686 mmx i586 i486 i386 +. elif ${CPUTYPE} == "p2" +MACHINE_CPU = sse i686 mmx i586 i486 i386 . elif ${CPUTYPE} == "i686" MACHINE_CPU = i686 i586 i486 i386 +. elif ${CPUTYPE} == "i586/mmx" +MACHINE_CPU = mmx i586 i486 i386 . elif ${CPUTYPE} == "i586" MACHINE_CPU = i586 i486 i386 . elif ${CPUTYPE} == "i486" |
