diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2001-02-27 11:21:47 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2001-02-27 11:21:47 +0000 |
| commit | 181b6941c742ba68db7f933cbe1fb4e842f99c22 (patch) | |
| tree | 0574edcc153274a6859628cccbabe36d1ffa40f3 | |
| parent | 79f0014dd5ac3c3f8898ff3ca23ef0238179806e (diff) | |
Notes
| -rw-r--r-- | etc/defaults/make.conf | 4 | ||||
| -rw-r--r-- | share/examples/etc/make.conf | 4 | ||||
| -rw-r--r-- | share/mk/bsd.cpu.mk | 22 |
3 files changed, 27 insertions, 3 deletions
diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf index 8f4ba6f0c612..b5b6e2e16a26 100644 --- a/etc/defaults/make.conf +++ b/etc/defaults/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/examples/etc/make.conf b/share/examples/etc/make.conf index 8f4ba6f0c612..b5b6e2e16a26 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 bbf3080da0a1..63937f340e22 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" |