Updated cpuflags to 0.26

    Fix cpu parsing code for amiga (From Tim Preston), plus handle 21066
    in alpha.

3 files changed, 28 insertions, 24 deletions

diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile
index 337b7e8f27b..2bdd6ae4668 100644
--- a/devel/cpuflags/Makefile
+++ b/devel/cpuflags/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2002/07/13 11:27:29 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2002/07/15 10:48:46 abs Exp $
 #
 
-DISTNAME=		cpuflags-0.25
+DISTNAME=		cpuflags-0.26
 CATEGORIES=		sysutils
 MASTER_SITES=		# empty
 DISTFILES=		# empty
diff --git a/devel/cpuflags/files/cpuflags.1 b/devel/cpuflags/files/cpuflags.1
index ce29546fc34..00b27842db8 100644
--- a/devel/cpuflags/files/cpuflags.1
+++ b/devel/cpuflags/files/cpuflags.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: cpuflags.1,v 1.6 2002/01/03 11:54:47 abs Exp $
+.\"	$NetBSD: cpuflags.1,v 1.7 2002/07/15 10:48:47 abs Exp $
 .Dd May 31, 2001
 .Dt CPUFLAGS 1
 .Os
@@ -21,7 +21,7 @@ will set the following
 .Xr make 1
 variables. The first two are explicitly added to MAKE_ENV, while MAKE_FLAGS
 will have CCOPTIONS=${CPU_FLAGS}
-.Bl -tag -width CPU_FLAGS -compact
+.Bl -tag -width LOWER_CPU_DIR -compact
 .It
 .It CPU_FLAGS
 The output of cpuflags
diff --git a/devel/cpuflags/files/cpuflags.NetBSD b/devel/cpuflags/files/cpuflags.NetBSD
index cecd308f1c1..dec58574d60 100755
--- a/devel/cpuflags/files/cpuflags.NetBSD
+++ b/devel/cpuflags/files/cpuflags.NetBSD
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: cpuflags.NetBSD,v 1.21 2002/04/11 11:14:31 abs Exp $
+# $NetBSD: cpuflags.NetBSD,v 1.22 2002/07/15 10:48:47 abs Exp $
 
 if [ -x /sbin/sysctl ] ;then
     SYSCTL=/sbin/sysctl
@@ -21,9 +21,11 @@ case $hw_machine_arch in
 
     alpha)
 	# cpu0 at mainbus0: ID 0 (primary), 21164A-0 (unknown ...
-	if egrep -q '^cpu0.*21164A' /var/run/dmesg.boot 2>/dev/null ; then
-	    FLAGS="-mcpu=21164a"
-	fi ;;
+	case "`egrep '^cpu0 ' /var/run/dmesg.boot`" in
+	    *21164A*)	FLAGS="-mcpu=21164a" ;;
+	    *21066*)	FLAGS="-mcpu=21064" ;;
+	esac
+	;;
 
     arm | arm32) case $hw_model in
 	ARM610*)		FLAGS="-mcpu=arm610"		;; # risc pc
@@ -56,26 +58,26 @@ case $hw_machine_arch in
 	*686-class*)	FLAGS='-march=pentiumpro'	;;
     esac ;;
 
-    m68k) case $hw_model in
-	*\(68020\))		FLAGS='-m68020'			;; # Untested
-	*\(68030\))		FLAGS='-m68030'			;; # Mac LC III
-	*\(68040\))		FLAGS='-m68040'			;; # Untested
-	*\(68060\))		FLAGS='-m68060'			;; # Untested
+    m68k) case $hw_model in				   # Examples
+	*\(68020)		FLAGS='-m68020'		;; # Untested
+	*\(68030)		FLAGS='-m68030'		;; # Mac LC III
+	*\(68040)		FLAGS='-m68040'		;; # Untested
+	*\(68060)		FLAGS='-m68060'		;; # Upgr amiga 3000
     esac ;;
 
-    powerpc) case $hw_model in
-	601\ *)		   	FLAGS='-mcpu=601'		;; # Untested
-	602\ *)		   	FLAGS='-mcpu=602'		;; # Untested
-	603\ *)		   	FLAGS='-mcpu=603'		;; # Untested
-	603ev\ *)		FLAGS='-mcpu=603e'		;; # PM 4400
-	604\ *)		   	FLAGS='-mcpu=604'		;; # Mac 8500
-	604ev\ *)		FLAGS='-mcpu=604e'		;; # upgr B&W G3
-	750\ *)		   	FLAGS='-mcpu=750'		;; # Untested
-	740\ *)		   	FLAGS='-mcpu=750'		;; # Untested
-	620\ *)		   	FLAGS='-mcpu=750'		;; # Untested
+    powerpc) case $hw_model in				   # Examples
+	601\ *)		   	FLAGS='-mcpu=601'	;; # Untested
+	602\ *)		   	FLAGS='-mcpu=602'	;; # Untested
+	603\ *)		   	FLAGS='-mcpu=603'	;; # Untested
+	603ev\ *)		FLAGS='-mcpu=603e'	;; # PM 4400
+	604\ *)		   	FLAGS='-mcpu=604'	;; # Mac 8500
+	604ev\ *)		FLAGS='-mcpu=604e'	;; # upgr B&W G3
+	750\ *)		   	FLAGS='-mcpu=750'	;; # Untested
+	740\ *)		   	FLAGS='-mcpu=750'	;; # Untested
+	620\ *)		   	FLAGS='-mcpu=750'	;; # Untested
     esac ;;
 
-    sparc | sparc64) case $hw_model in
+    sparc | sparc64) case $hw_model in				   # Examples
 	MB86900/1A*)		FLAGS='-mcpu=cypress'		;; # ss1+
 	CY7C601*)		FLAGS='-mcpu=cypress'		;; # ss2
 	W8601/8701*)		FLAGS='-mcpu=cypress'		;; # elc
@@ -99,6 +101,8 @@ if [ -z "$FLAGS" -a -z "$NONE" ] ; then
     echo "  hw.model        : '$hw_model'"				>&2
     echo "  hw.machine      : '$hw_machine'"				>&2
     echo "  hw.machine_arch : '$hw_machine_arch'"			>&2
+    echo "  cpu details     :"						>&2
+    egrep '^cpu' /var/run/dmesg.boot 					>&2
 fi
 
 # Fixup flags for old gcc