[pkgsrc/trunk]: pkgsrc/devel/cpuflags Update cpuflags to 0.74:

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fbb2c95d9730
branches:  trunk
changeset: 478707:fbb2c95d9730
user:      abs <abs%pkgsrc.org@localhost>
date:      Wed Jul 28 16:54:03 2004 +0000

description:
Update cpuflags to 0.74:
    NetBSD/Linux:
        athlon-4, athlon-mp, athlon-tbird, and athlon-xp should fall back to
        athlon in gcc3, and only pentiumpro in 2.95
    Linux:
        Identify "AMD Athlon(tm) XP "* - thanks to Sebastian Prause

diffstat:

 devel/cpuflags/Makefile              |   4 ++--
 devel/cpuflags/files/cpuflags.Linux  |  31 ++++++++++++++++++++++---------
 devel/cpuflags/files/cpuflags.NetBSD |  28 ++++++++++++++++++++--------
 3 files changed, 44 insertions(+), 19 deletions(-)

diffs (132 lines):

diff -r 459899ec51da -r fbb2c95d9730 devel/cpuflags/Makefile
--- a/devel/cpuflags/Makefile   Wed Jul 28 16:37:00 2004 +0000
+++ b/devel/cpuflags/Makefile   Wed Jul 28 16:54:03 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2004/07/27 19:25:44 abs Exp $
+# $NetBSD: Makefile,v 1.77 2004/07/28 16:54:03 abs Exp $
 #
 
-DISTNAME=      cpuflags-0.73
+DISTNAME=      cpuflags-0.74
 CATEGORIES=    sysutils
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 459899ec51da -r fbb2c95d9730 devel/cpuflags/files/cpuflags.Linux
--- a/devel/cpuflags/files/cpuflags.Linux       Wed Jul 28 16:37:00 2004 +0000
+++ b/devel/cpuflags/files/cpuflags.Linux       Wed Jul 28 16:54:03 2004 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: cpuflags.Linux,v 1.6 2004/07/27 19:25:44 abs Exp $
+# $NetBSD: cpuflags.Linux,v 1.7 2004/07/28 16:54:03 abs Exp $
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH
 
 if [ -n "$1" ]; then
@@ -18,11 +18,12 @@
 
 case $hw_machine_arch in
     # i386
-    i386)                              FLAGS='-march=i386'     ;;
-    i486)                              FLAGS='-march=i486'     ;;
-    i586)                              FLAGS='-march=pentium'  ;;
+    i386)                              FLAGS='-march=i386'             ;;
+    i486)                              FLAGS='-march=i486'             ;;
+    i586)                              FLAGS='-march=pentium'          ;;
     i686) case $hw_model in
-       "AMD Duron(TM)")                FLAGS='-march=athlon'   ;;
+       "AMD Duron(TM)")                FLAGS='-march=athlon'           ;;
+       "AMD Athlon(tm) XP "*)          FLAGS='-march=athlon-xp'        ;;
     esac
     ;;
     #
@@ -61,10 +62,10 @@
 2.90:-mcpu=v9:-mv8
 2.95:-march=k6:-march=pentium
 3.0:-march=athlon:-march=pentiumpro
-3.1:-march=athlon-4:-march=pentiumpro
-3.1:-march=athlon-mp:-march=pentiumpro
-3.1:-march=athlon-tbird:-march=pentiumpro
-3.1:-march=athlon-xp:-march=pentiumpro
+3.1:-march=athlon-4:-march=athlon
+3.1:-march=athlon-mp:-march=athlon
+3.1:-march=athlon-tbird:-march=athlon
+3.1:-march=athlon-xp:-march=athlon
 3.1:-march=k6-2:-march=k6
 3.1:-march=k6-3:-march=k6
 3.1:-march=pentium-mmx:-march=pentium
@@ -96,6 +97,18 @@
 3.1:-mtune=r6000:-cpu=r6000
 3.1:-mtune=r8000:-cpu=r8000
 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=athlong-fx:-march=athlon-xp
+3.4:-march=c3-2:-march=c3
+3.4:-march=k8:-march=athlon-xp
+3.4:-march=nocona:-march=pentium4
+3.4:-march=opteron:-march=athlon-xp
+3.4:-march=pentium-m:-march=pentium3
+3.4:-march=pentium3m:-march=pentium3
+3.4:-march=pentium4m:-march=pentium4
+3.4:-march=prescott:-march=pentium4
 EOD
 `
 fi
diff -r 459899ec51da -r fbb2c95d9730 devel/cpuflags/files/cpuflags.NetBSD
--- a/devel/cpuflags/files/cpuflags.NetBSD      Wed Jul 28 16:37:00 2004 +0000
+++ b/devel/cpuflags/files/cpuflags.NetBSD      Wed Jul 28 16:54:03 2004 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: cpuflags.NetBSD,v 1.52 2004/07/27 19:25:44 abs Exp $
+# $NetBSD: cpuflags.NetBSD,v 1.53 2004/07/28 16:54:03 abs Exp $
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH
 
 if [ -n "$1" ]; then
@@ -171,8 +171,8 @@
 #   gcc_version_in_which_option_was_introduced new_option  old_option
 
 if [ -n "$FLAGS" ]; then
-    gcc_ver=$(${CC} -dumpversion | sed 's/^egcs-//')
-    FLAGS=$(awk -F: -v "flags=$FLAGS" -v "gcc_ver=$gcc_ver" '
+    gcc_ver=`${CC} -dumpversion | sed 's/^egcs-//'`
+    FLAGS=`awk -F: -v "flags=$FLAGS" -v "gcc_ver=$gcc_ver" '
        { if (gcc_ver < $1){map[$2] = ""$3} }
        END { while (flags in map) {flags = map[flags]} print flags }
        ' <<EOD
@@ -190,10 +190,10 @@
 2.90:-mcpu=v9:-mv8
 2.95:-march=k6:-march=pentium
 3.0:-march=athlon:-march=pentiumpro
-3.1:-march=athlon-4:-march=pentiumpro
-3.1:-march=athlon-mp:-march=pentiumpro
-3.1:-march=athlon-tbird:-march=pentiumpro
-3.1:-march=athlon-xp:-march=pentiumpro
+3.1:-march=athlon-4:-march=athlon
+3.1:-march=athlon-mp:-march=athlon
+3.1:-march=athlon-tbird:-march=athlon
+3.1:-march=athlon-xp:-march=athlon
 3.1:-march=k6-2:-march=k6
 3.1:-march=k6-3:-march=k6
 3.1:-march=pentium-mmx:-march=pentium
@@ -225,8 +225,20 @@
 3.1:-mtune=r6000:-cpu=r6000
 3.1:-mtune=r8000:-cpu=r8000
 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=athlong-fx:-march=athlon-xp
+3.4:-march=c3-2:-march=c3
+3.4:-march=k8:-march=athlon-xp
+3.4:-march=nocona:-march=pentium4
+3.4:-march=opteron:-march=athlon-xp
+3.4:-march=pentium-m:-march=pentium3
+3.4:-march=pentium3m:-march=pentium3
+3.4:-march=pentium4m:-march=pentium4
+3.4:-march=prescott:-march=pentium4
 EOD
-)
+`
 fi
 
 echo $FLAGS