Date: Fri, 6 Sep 2002 13:30:26 -0700 From: Kris Kennaway <kris@obsecurity.org> To: Peter Wemm <peter@wemm.org> Cc: Darren Pilgrim <dmp@pantherdragon.org>, Matthew Dillon <dillon@apollo.backplane.com>, Dan Nelson <dnelson@allantgroup.com>, Terry Lambert <tlambert2@mindspring.com>, Jason Andresen <jandrese@mitre.org>, Dmitry Morozovsky <marck@rinet.ru>, hackers@FreeBSD.ORG Subject: Updating bsd.cpu.mk (Re: -fomit-frame-pointer for the world build) Message-ID: <20020906203026.GA78157@xor.obsecurity.org> In-Reply-To: <20020807015511.A1A092A7D6@canning.wemm.org> References: <3D50664F.71603B49@pantherdragon.org> <20020807015511.A1A092A7D6@canning.wemm.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Tue, Aug 06, 2002 at 06:55:11PM -0700, Peter Wemm wrote:
> `-mcpu=CPU-TYPE'
> Tune to CPU-TYPE everything applicable about the generated code,
> except for the ABI and the set of available instructions. The
> choices for CPU-TYPE are `i386', `i486', `i586', `i686',
> `pentium', `pentium-mmx', `pentiumpro', `pentium2', `pentium3',
> `pentium4', `k6', `k6-2', `k6-3', `athlon', `athlon-tbird',
> `athlon-4', `athlon-xp' and `athlon-mp'.
>
> You can also add -msse, -msse2, -m3dnow to use those extensions. It would
> appear that our bsd.cpu.mk file is out of date and is missing the newer
> cpu types.
How about the following patch (I've only tested 'pentium3'):
Index: share/mk/bsd.cpu.mk
===================================================================
RCS file: /usr/home/ncvs/src/share/mk/bsd.cpu.mk,v
retrieving revision 1.16
diff -u -r1.16 bsd.cpu.mk
--- share/mk/bsd.cpu.mk 2 Aug 2002 18:04:22 -0000 1.16
+++ share/mk/bsd.cpu.mk 6 Sep 2002 20:25:46 -0000
@@ -28,8 +28,8 @@
CPUTYPE = i686
. elif ${CPUTYPE} == "pentium"
CPUTYPE = i586
-. elif ${CPUTYPE} == "athlon"
-CPUTYPE = k7
+. elif ${CPUTYPE} == "k7"
+CPUTYPE = athlon
. endif
. endif
@@ -42,20 +42,30 @@
# http://gcc.gnu.org/onlinedocs/gcc/RS-6000-and-PowerPC-Options.html
. if ${MACHINE_ARCH} == "i386"
-. if ${CPUTYPE} == "k7"
+. if ${CPUTYPE} == "athlon-mp"
+_CPUCFLAGS = -march=athlon-mp
+. elif ${CPUTYPE} == "athlon-xp"
+_CPUCFLAGS = -march=athlon-xp
+. elif ${CPUTYPE} == "athlon-4"
+_CPUCFLAGS = -march=athlon-4
+. elif ${CPUTYPE} == "athlon-tbird"
+_CPUCFLAGS = -march=athlon-tbird
+. elif ${CPUTYPE} == "athlon"
_CPUCFLAGS = -march=athlon
+. elif ${CPUTYPE} == "k6-3"
+_CPUCFLAGS = -march=k6-3
. elif ${CPUTYPE} == "k6-2"
-_CPUCFLAGS = -march=k6
+_CPUCFLAGS = -march=k6-2
. elif ${CPUTYPE} == "k6"
_CPUCFLAGS = -march=k6
. elif ${CPUTYPE} == "k5"
_CPUCFLAGS = -march=pentium
. elif ${CPUTYPE} == "p4"
-_CPUCFLAGS = -march=pentiumpro
+_CPUCFLAGS = -march=pentium4
. elif ${CPUTYPE} == "p3"
-_CPUCFLAGS = -march=pentiumpro
+_CPUCFLAGS = -march=pentium3
. elif ${CPUTYPE} == "p2"
-_CPUCFLAGS = -march=pentiumpro
+_CPUCFLAGS = -march=pentium2
. elif ${CPUTYPE} == "i686"
_CPUCFLAGS = -march=pentiumpro
. elif ${CPUTYPE} == "i586/mmx"
Index: share/examples/etc/make.conf
===================================================================
RCS file: /usr/home/ncvs/src/share/examples/etc/make.conf,v
retrieving revision 1.198
diff -u -r1.198 make.conf
--- share/examples/etc/make.conf 2 Aug 2002 18:04:22 -0000 1.198
+++ share/examples/etc/make.conf 6 Sep 2002 20:25:19 -0000
@@ -24,7 +24,7 @@
# NO_CPU_CFLAGS variable below.
# Currently the following CPU types are recognized:
# Intel x86 architecture:
-# (AMD CPUs) k7 k6-2 k6 k5
+# (AMD CPUs) athlon-mp athlon-xp athlon-4 athlon-tbird athlon k6-3 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
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (FreeBSD)
iD8DBQE9eRBhWry0BWjoQKURAg2NAJ0ZpUWXoWQmXdPEX/2dgNONuwrSWwCg3ii8
Tt16zWIfWLcis7ai9VVin0A=
=fvmy
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020906203026.GA78157>