Date: Fri, 6 Sep 2002 17:55:47 -0700 From: Maxime Henrion <mux@freebsd.org> To: Kris Kennaway <kris@obsecurity.org> Cc: Peter Wemm <peter@wemm.org>, 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: Re: Updating bsd.cpu.mk (Re: -fomit-frame-pointer for the world build) Message-ID: <20020907005547.GM86074@elvis.mu.org> In-Reply-To: <20020906203026.GA78157@xor.obsecurity.org> References: <3D50664F.71603B49@pantherdragon.org> <20020807015511.A1A092A7D6@canning.wemm.org> <20020906203026.GA78157@xor.obsecurity.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
Kris Kennaway wrote:
> 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'):
[patch ripped]
I've got a very similar patch which I believe to be a bit more complete
because it also updates the MACHINE_CPU variable which lists the
features available on a particular CPU. I attach it to this mail.
Cheers,
Maxime
[-- Attachment #2 --]
Index: bsd.cpu.mk
===================================================================
RCS file: /space2/ncvs/src/share/mk/bsd.cpu.mk,v
retrieving revision 1.16
diff -u -p -r1.16 bsd.cpu.mk
--- bsd.cpu.mk 2 Aug 2002 18:04:22 -0000 1.16
+++ bsd.cpu.mk 11 Aug 2002 18:46:06 -0000
@@ -28,8 +28,8 @@ CPUTYPE = ultrasparc
CPUTYPE = i686
. elif ${CPUTYPE} == "pentium"
CPUTYPE = i586
-. elif ${CPUTYPE} == "athlon"
-CPUTYPE = k7
+. elif ${CPUTYPE} == "k7"
+CPUTYPE = athlon
. endif
. endif
@@ -42,20 +42,30 @@ CPUTYPE = k7
# 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"
@@ -93,8 +103,18 @@ CFLAGS += ${_CPUCFLAGS}
# presence of a CPU feature.
.if ${MACHINE_ARCH} == "i386"
-. if ${CPUTYPE} == "k7"
+. if ${CPUTYPE} == "athlon-mp"
+MACHINE_CPU = sse k7 3dnow mmx k6 k5 i586 i486 i386
+. elif ${CPUTYPE} == "athlon-xp"
+MACHINE_CPU = sse k7 3dnow mmx k6 k5 i586 i486 i386
+. elif ${CPUTYPE} == "athlon-4"
+MACHINE_CPU = sse k7 3dnow mmx k6 k5 i586 i486 i386
+. elif ${CPUTYPE} == "athlon-tbird"
+MACHINE_CPU = k7 3dnow mmx k6 k5 i586 i486 i386
+. elif ${CPUTYPE} == "athlon"
MACHINE_CPU = k7 3dnow mmx k6 k5 i586 i486 i386
+. elif ${CPUTYPE} == "k6-3"
+MACHINE_CPU = 3dnow mmx k6 k5 i586 i486 i386
. elif ${CPUTYPE} == "k6-2"
MACHINE_CPU = 3dnow mmx k6 k5 i586 i486 i386
. elif ${CPUTYPE} == "k6"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020907005547.GM86074>