pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/doc Update cpuflags to 0.70



details:   https://anonhg.NetBSD.org/pkgsrc/rev/45f0ac9d2c61
branches:  trunk
changeset: 476331:45f0ac9d2c61
user:      abs <abs%pkgsrc.org@localhost>
date:      Sun Jun 06 22:59:29 2004 +0000

description:
Update cpuflags to 0.70
    Correctly 'downgrade' -march=pentium3 -mno-sse to -march=pentiumpro
    for older compilers. Should address PR pkg/25759

diffstat:

 devel/cpuflags/Makefile              |    4 +-
 devel/cpuflags/files/cpuflags.NetBSD |  108 ++++++++++++++++++----------------
 doc/CHANGES                          |    3 +-
 3 files changed, 61 insertions(+), 54 deletions(-)

diffs (176 lines):

diff -r 1f4acfe13959 -r 45f0ac9d2c61 devel/cpuflags/Makefile
--- a/devel/cpuflags/Makefile   Sun Jun 06 22:10:51 2004 +0000
+++ b/devel/cpuflags/Makefile   Sun Jun 06 22:59:29 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.72 2004/05/10 17:39:39 abs Exp $
+# $NetBSD: Makefile,v 1.73 2004/06/06 22:59:29 abs Exp $
 #
 
-DISTNAME=      cpuflags-0.68
+DISTNAME=      cpuflags-0.70
 CATEGORIES=    sysutils
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 1f4acfe13959 -r 45f0ac9d2c61 devel/cpuflags/files/cpuflags.NetBSD
--- a/devel/cpuflags/files/cpuflags.NetBSD      Sun Jun 06 22:10:51 2004 +0000
+++ b/devel/cpuflags/files/cpuflags.NetBSD      Sun Jun 06 22:59:29 2004 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: cpuflags.NetBSD,v 1.48 2004/04/22 12:00:05 abs Exp $
+# $NetBSD: cpuflags.NetBSD,v 1.49 2004/06/06 22:59:30 abs Exp $
 
 if [ -x /sbin/sysctl ] ;then
     SYSCTL=/sbin/sysctl
@@ -41,6 +41,7 @@
     arm | arm32) case $hw_model in
        ARM610*)                FLAGS="-mcpu=arm610"            ;; # risc pc
        ARM710*)                FLAGS="-mcpu=arm710"            ;; # risc pc
+       i80321\ *)              FLAGS="-mcpu=xscale"            ;; # iyonix
        SA-110*)        
            case $hw_machine in                  # arm32 split post 1.5
                cats|shark|hpcarm|netwinder)
@@ -83,7 +84,9 @@
        *486-class*)                    FLAGS='-march=i486'             ;;
        *586-class*)                    FLAGS='-march=pentium'          ;;
        *686-class*)                    FLAGS='-march=pentiumpro'       ;;
-    esac ;;
+    esac
+    FLAGS='-march=pentium3 -mno-sse'
+    ;;
 
     m68k) case $hw_model in                               # Examples
        *\(68020*|*\ MC68020\ *) FLAGS='-m68020'        ;; # Untested
@@ -158,10 +161,10 @@
 
 if [ -z "$FLAGS" -a -z "$NONE" ] ; then
     echo 'Unknown machine - please send details to abs%netbsd.org@localhost'   >&2
-    echo "  hw.model       : '$hw_model'"                              >&2
-    echo "  hw.machine     : '$hw_machine'"                            >&2
+    echo "  hw.model        : '$hw_model'"                             >&2
+    echo "  hw.machine      : '$hw_machine'"                           >&2
     echo "  hw.machine_arch : '$hw_machine_arch'"                      >&2
-    echo "  cpu details            :"                                          >&2
+    echo "  cpu details     :"                                         >&2
     egrep '^cpu' /var/run/dmesg.boot                                   >&2
 fi
 
@@ -174,55 +177,58 @@
 
 if [ -n "$FLAGS" ]; then
     gcc_ver=`${CC} -dumpversion | sed 's/^egcs-//'`
-    FLAGS=`awk -v "flags=$FLAGS" -v "gcc_ver=$gcc_ver" '
+    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
-2.90   -march=i386             -mno-486
-2.90   -march=i486             -m486
-2.90   -march=pentium          -m486
-2.90   -march=pentiumpro       -m486
-2.90   -mcpu=21164a    
-2.90   -mcpu=arm610            -m6
-2.90   -mcpu=arm710            -m6
-2.90   -mcpu=cypress           -mcypress
-2.90   -mcpu=sparclite         -msparclite
-2.90   -mcpu=strongarm110      -m6
-2.90   -mcpu=supersparc        -msupersparc
-2.90   -mcpu=v9                -mv8
-2.95   -march=k6               -march=pentium
-3.0    -march=athlon           -march=pentiumpro
-3.0    -march=athlon-4         -march=pentiumpro
-3.0    -march=athlon-mp        -march=pentiumpro
-3.0    -march=athlon-xp        -march=pentiumpro
-3.1    -march=r2000            -cpu=r2000
-3.1    -march=r3000            -cpu=r3000
-3.1    -march=r3900            -cpu=r3900
-3.1    -march=r4000            -cpu=r4000
-3.1    -march=r4100            -cpu=r4100
-3.1    -march=r4300            -cpu=r4300
-3.1    -march=r4400            -cpu=r4400
-3.1    -march=r4600            -cpu=r4600
-3.1    -march=r5000            -cpu=r5000
-3.1    -march=r6000            -cpu=r6000
-3.1    -march=r8000            -cpu=r8000
-3.1    -mcpu=21264a            -mcpu=21264
-3.1    -mtune=r2000            -cpu=r2000
-3.1    -mtune=r3000            -cpu=r3000
-3.1    -mtune=r3900            -cpu=r3900
-3.1    -mtune=r4000            -cpu=r4000
-3.1    -mtune=r4100            -cpu=r4100
-3.1    -mtune=r4300            -cpu=r4300
-3.1    -mtune=r4400            -cpu=r4400
-3.1    -mtune=r4600            -cpu=r4600
-3.1    -mtune=r5000            -cpu=r5000
-3.1    -mtune=r6000            -cpu=r6000
-3.1    -mtune=r8000            -cpu=r8000
-3.2    -march=k6-2             -march=k6
-3.2    -march=k6-3             -march=k6
-3.2    -march=pentium2         -march=pentiumpro
-3.2    -march=pentium3         -march=pentiumpro
-3.2    -march=pentium4         -march=pentiumpro
+2.90:-march=i386:-mno-486
+2.90:-march=i486:-m486
+2.90:-march=pentium:-m486
+2.90:-march=pentiumpro:-m486
+2.90:-mcpu=21164a:
+2.90:-mcpu=arm610:-m6
+2.90:-mcpu=arm710:-m6
+2.90:-mcpu=cypress:-mcypress
+2.90:-mcpu=sparclite:-msparclite
+2.90:-mcpu=strongarm110:-m6
+2.90:-mcpu=supersparc:-msupersparc
+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=k6-2:-march=k6
+3.1:-march=k6-3:-march=k6
+3.1:-march=pentium-mmx:-march=pentium
+3.1:-march=pentium2:-march=pentiumpro
+3.1:-march=pentium3 -mno-sse:-march=pentiumpro
+3.1:-march=pentium3:-march=pentiumpro
+3.1:-march=pentium4:-march=pentiumpro
+3.1:-march=r2000:-cpu=r2000
+3.1:-march=r3000:-cpu=r3000
+3.1:-march=r3900:-cpu=r3900
+3.1:-march=r4000:-cpu=r4000
+3.1:-march=r4100:-cpu=r4100
+3.1:-march=r4300:-cpu=r4300
+3.1:-march=r4400:-cpu=r4400
+3.1:-march=r4600:-cpu=r4600
+3.1:-march=r5000:-cpu=r5000
+3.1:-march=r6000:-cpu=r6000
+3.1:-march=r8000:-cpu=r8000
+3.1:-mcpu=21264a:-mcpu=21264
+3.1:-mtune=r2000:-cpu=r2000
+3.1:-mtune=r3000:-cpu=r3000
+3.1:-mtune=r3900:-cpu=r3900
+3.1:-mtune=r4000:-cpu=r4000
+3.1:-mtune=r4100:-cpu=r4100
+3.1:-mtune=r4300:-cpu=r4300
+3.1:-mtune=r4400:-cpu=r4400
+3.1:-mtune=r4600:-cpu=r4600
+3.1:-mtune=r5000:-cpu=r5000
+3.1:-mtune=r6000:-cpu=r6000
+3.1:-mtune=r8000:-cpu=r8000
 EOD
 `
 fi
diff -r 1f4acfe13959 -r 45f0ac9d2c61 doc/CHANGES
--- a/doc/CHANGES       Sun Jun 06 22:10:51 2004 +0000
+++ b/doc/CHANGES       Sun Jun 06 22:59:29 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.6169 2004/06/06 22:11:52 abs Exp $
+$NetBSD: CHANGES,v 1.6170 2004/06/06 23:00:03 abs Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -2827,4 +2827,5 @@
        Updated roundup to 0.7.3 [recht 2004-06-06]
        Updated exim to 4.34 [abs 2004-06-06]
        Updated exim-exiscan to 4.34_22 [abs 2004-06-06]
+       Updated cpuflags to 0.70 [abs 2004-06-06]
 



Home | Main Index | Thread Index | Old Index