summaryrefslogtreecommitdiff
path: root/devel/cpuflags
diff options
context:
space:
mode:
authorrh <rh>2003-10-19 00:24:28 +0000
committerrh <rh>2003-10-19 00:24:28 +0000
commitdf6b23b019db9d4297ab8c06fa7a65013f687b61 (patch)
treec54caefb0868fd3ff1c8d83c6008a4a3036bd9c0 /devel/cpuflags
parenteca8d3a7a78dd694023e084138b09b8f858fd0d0 (diff)
downloadpkgsrc-df6b23b019db9d4297ab8c06fa7a65013f687b61.tar.gz
Fix an Athlon detection glitch: the "Athlon Model 1" is neither an
"Athlon MP" nor a "Pentium Pro". Correct this by testing for the special cases first rather than trying to be clever in the generic test. Bump package version to 0.58
Diffstat (limited to 'devel/cpuflags')
-rw-r--r--devel/cpuflags/Makefile4
-rwxr-xr-xdevel/cpuflags/files/cpuflags.NetBSD4
2 files changed, 4 insertions, 4 deletions
diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile
index 8216f6b6a39..508dd5f510f 100644
--- a/devel/cpuflags/Makefile
+++ b/devel/cpuflags/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2003/10/02 16:10:00 abs Exp $
+# $NetBSD: Makefile,v 1.61 2003/10/19 00:24:28 rh Exp $
#
-DISTNAME= cpuflags-0.57
+DISTNAME= cpuflags-0.58
CATEGORIES= sysutils
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/devel/cpuflags/files/cpuflags.NetBSD b/devel/cpuflags/files/cpuflags.NetBSD
index 248df1f38ab..162cba2d021 100755
--- a/devel/cpuflags/files/cpuflags.NetBSD
+++ b/devel/cpuflags/files/cpuflags.NetBSD
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: cpuflags.NetBSD,v 1.42 2003/10/02 16:10:00 abs Exp $
+# $NetBSD: cpuflags.NetBSD,v 1.43 2003/10/19 00:24:28 rh Exp $
if [ -x /sbin/sysctl ] ;then
SYSCTL=/sbin/sysctl
@@ -66,10 +66,10 @@ case $hw_machine_arch in
*AMD\ K6-2*) FLAGS='-march=k6-2' ;;
*AMD\ K6*) FLAGS='-march=k6' ;;
*AMD\ Duron*) FLAGS='-march=athlon' ;;
- *AMD\ K7*|*AMD\ Athlon*^[4XM]*) FLAGS='-march=athlon' ;;
*AMD\ Athlon\ 4*) FLAGS='-march=athlon-4' ;;
*AMD\ Athlon\ MP*) FLAGS='-march=athlon-mp' ;;
*AMD\ Athlon\ XP*) FLAGS='-march=athlon-xp' ;;
+ *AMD\ K7*|*AMD\ Athlon*) FLAGS='-march=athlon' ;;
*386-class*) FLAGS='-march=i386' ;;
*486-class*) FLAGS='-march=i486' ;;
*586-class*) FLAGS='-march=pentium' ;;