Update cpuflags to 0.77

    Correctly identify 7400 and 7450 cpus (from Timo Schöler), and fall back
    to 750 not 740 for older gcc versions.

4 files changed, 18 insertions, 12 deletions

diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile
index 540bd265641..0983e489d00 100644
--- a/devel/cpuflags/Makefile
+++ b/devel/cpuflags/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.79 2004/09/23 11:41:10 abs Exp $
+# $NetBSD: Makefile,v 1.80 2004/11/03 18:16:27 abs Exp $
 #
 
-DISTNAME=	cpuflags-0.76
+DISTNAME=	cpuflags-0.77
 CATEGORIES=	sysutils
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/devel/cpuflags/files/cpuflags.Linux b/devel/cpuflags/files/cpuflags.Linux
index e214e985b17..4df618bd708 100755
--- a/devel/cpuflags/files/cpuflags.Linux
+++ b/devel/cpuflags/files/cpuflags.Linux
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: cpuflags.Linux,v 1.9 2004/09/23 11:41:10 abs Exp $
+# $NetBSD: cpuflags.Linux,v 1.10 2004/11/03 18:16:27 abs Exp $
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH
 
 if [ "$1" = -v ] ; then
@@ -117,6 +117,8 @@ if [ -n "$FLAGS" ]; then
 3.1:-march=r6000:-cpu=r6000
 3.1:-march=r8000:-cpu=r8000
 3.1:-mcpu=21264a:-mcpu=21264
+3.1:-mcpu=7400:-mcpu=750
+3.1:-mcpu=7450:-mcpu=750
 3.1:-mtune=r2000:-cpu=r2000
 3.1:-mtune=r3000:-cpu=r3000
 3.1:-mtune=r3900:-cpu=r3900
@@ -131,8 +133,8 @@ if [ -n "$FLAGS" ]; then
 3.3:-march=c3:-march=i586
 3.3:-march=winchip-c6:-march=i586
 3.3:-march=winchip2:-march=i586
-3.4:-march=athlon64:-march=athlon-xp
 3.4:-march=athlon-fx:-march=athlon-xp
+3.4:-march=athlon64:-march=athlon-xp
 3.4:-march=c3-2:-march=c3
 3.4:-march=k8:-march=athlon-xp
 3.4:-march=nocona:-march=pentium4
diff --git a/devel/cpuflags/files/cpuflags.NetBSD b/devel/cpuflags/files/cpuflags.NetBSD
index ba0450fd4af..8dceab7201f 100755
--- a/devel/cpuflags/files/cpuflags.NetBSD
+++ b/devel/cpuflags/files/cpuflags.NetBSD
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: cpuflags.NetBSD,v 1.55 2004/09/23 11:41:10 abs Exp $
+# $NetBSD: cpuflags.NetBSD,v 1.56 2004/11/03 18:16:27 abs Exp $
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH
 
 if [ "$1" = -v ] ; then
@@ -136,11 +136,11 @@ case $hw_machine_arch in
 	603e\ *|603ev\ *)	FLAGS='-mcpu=603e'	;; # Umax C500 / PM4400
 	604\ *)			FLAGS='-mcpu=604'	;; # Mac 8500
 	604ev\ *)		FLAGS='-mcpu=604e'	;; # upgr B&W G3
-	7450\ *)		FLAGS='-mcpu=740'	;; # tibook 550
-	7400\ *)		FLAGS='-mcpu=740'	;; # AGP G4/400 Mac
-	750\ *)			FLAGS='-mcpu=750'	;; # Untested
-	740\ *)			FLAGS='-mcpu=740'	;; # Untested
 	620\ *)			FLAGS='-mcpu=620'	;; # Untested
+	7400\ *)		FLAGS='-mcpu=7400'	;; # AGP G4/400 Mac
+	740\ *)			FLAGS='-mcpu=740'	;; # Untested
+	7450\ *)		FLAGS='-mcpu=7450'	;; # tibook 550
+	750\ *)			FLAGS='-mcpu=750'	;; # Untested
     esac ;;
 
     sparc | sparc64) case " $hw_model" in			   # Examples
@@ -236,6 +236,8 @@ if [ -n "$FLAGS" ]; then
 3.1:-march=r6000:-cpu=r6000
 3.1:-march=r8000:-cpu=r8000
 3.1:-mcpu=21264a:-mcpu=21264
+3.1:-mcpu=7400:-mcpu=750
+3.1:-mcpu=7450:-mcpu=750
 3.1:-mtune=r2000:-cpu=r2000
 3.1:-mtune=r3000:-cpu=r3000
 3.1:-mtune=r3900:-cpu=r3900
@@ -250,8 +252,8 @@ if [ -n "$FLAGS" ]; then
 3.3:-march=c3:-march=i586
 3.3:-march=winchip-c6:-march=i586
 3.3:-march=winchip2:-march=i586
-3.4:-march=athlon64:-march=athlon-xp
 3.4:-march=athlon-fx:-march=athlon-xp
+3.4:-march=athlon64:-march=athlon-xp
 3.4:-march=c3-2:-march=c3
 3.4:-march=k8:-march=athlon-xp
 3.4:-march=nocona:-march=pentium4
diff --git a/devel/cpuflags/files/cpuflags.SunOS b/devel/cpuflags/files/cpuflags.SunOS
index 53d8bd1ccc0..076ae6bded0 100755
--- a/devel/cpuflags/files/cpuflags.SunOS
+++ b/devel/cpuflags/files/cpuflags.SunOS
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: cpuflags.SunOS,v 1.4 2004/09/23 11:41:10 abs Exp $
+# $NetBSD: cpuflags.SunOS,v 1.5 2004/11/03 18:16:27 abs Exp $
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH
 
 if [ "$1" = -v ] ; then
@@ -93,6 +93,8 @@ if [ -n "$FLAGS" ]; then
 3.1:-march=r6000:-cpu=r6000
 3.1:-march=r8000:-cpu=r8000
 3.1:-mcpu=21264a:-mcpu=21264
+3.1:-mcpu=7400:-mcpu=750
+3.1:-mcpu=7450:-mcpu=750
 3.1:-mtune=r2000:-cpu=r2000
 3.1:-mtune=r3000:-cpu=r3000
 3.1:-mtune=r3900:-cpu=r3900
@@ -107,8 +109,8 @@ if [ -n "$FLAGS" ]; then
 3.3:-march=c3:-march=i586
 3.3:-march=winchip-c6:-march=i586
 3.3:-march=winchip2:-march=i586
-3.4:-march=athlon64:-march=athlon-xp
 3.4:-march=athlon-fx:-march=athlon-xp
+3.4:-march=athlon64:-march=athlon-xp
 3.4:-march=c3-2:-march=c3
 3.4:-march=k8:-march=athlon-xp
 3.4:-march=nocona:-march=pentium4