[pkgsrc/trunk]: pkgsrc/devel/cpuflags Updated devel/cpuflags to 1.20

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5d087df80163
branches:  trunk
changeset: 551004:5d087df80163
user:      abs <abs%pkgsrc.org@localhost>
date:      Thu Dec 04 11:45:35 2008 +0000

description:
Updated devel/cpuflags to 1.20

  - Add cases for:
        'Intel Pentium III Xeon (686-class)' (Thanks Jum Wise)
        'Intel Pentium M (Dothan) (686-class)' (My T41p)
  - Remove duplicate m68k fpu check
  - Fix pentium2/pentium3 tranposition introduced in v1.19

diffstat:

 devel/cpuflags/Makefile          |   4 ++--
 devel/cpuflags/files/subr_NetBSD |  22 ++++++++++------------
 devel/cpuflags/files/subr_gcc    |  18 +++++++++++++-----
 3 files changed, 25 insertions(+), 19 deletions(-)

diffs (90 lines):

diff -r cefbe0b9f8f8 -r 5d087df80163 devel/cpuflags/Makefile
--- a/devel/cpuflags/Makefile   Thu Dec 04 10:47:36 2008 +0000
+++ b/devel/cpuflags/Makefile   Thu Dec 04 11:45:35 2008 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.125 2008/12/01 17:51:40 abs Exp $
+# $NetBSD: Makefile,v 1.126 2008/12/04 11:45:35 abs Exp $
 
-DISTNAME=      cpuflags-1.19
+DISTNAME=      cpuflags-1.20
 CATEGORIES=    devel sysutils
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r cefbe0b9f8f8 -r 5d087df80163 devel/cpuflags/files/subr_NetBSD
--- a/devel/cpuflags/files/subr_NetBSD  Thu Dec 04 10:47:36 2008 +0000
+++ b/devel/cpuflags/files/subr_NetBSD  Thu Dec 04 11:45:35 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: subr_NetBSD,v 1.3 2008/12/01 17:51:40 abs Exp $
+# $NetBSD: subr_NetBSD,v 1.4 2008/12/04 11:45:35 abs Exp $
 
 AWK=awk
 SED=sed
@@ -95,14 +95,16 @@
     i386 | x86_64)
        case "$cpu" in
            'AMD Athlon 64 or Athlon 64 FX or Opteron '*) ARCH='-march=opteron' ;;
-           'AMD Athlon 64 or Sempron (686-class),'*) ARCH='-march=athlon64' ;;
+           'AMD Athlon 64 or Sempron (686-class)'*) ARCH='-march=athlon64' ;;
            'AMD Dual-Core Opteron or Athlon 64 X2 '*) ARCH='-march=opteron' ;;
-           'Intel (686-class),'*)              ARCH='-march=pentiumpro' ;;
-           'Intel Celeron (686-class),'*)      ARCH='-march=pentiumpro' ;;
-           'Intel Core 2 (Merom) (686-class),'*) ARCH='-march=core2' ;;
-           'Intel Pentium 4 (686-class),'*)    ARCH='-march=pentium4' ;;
-           'Intel Pentium II (686-class),'*)   ARCH='-march=pentium3' ;;
-           'Intel Pentium III (686-class),'*)  ARCH='-march=pentium2' ;;
+           'Intel (686-class)'*)               ARCH='-march=pentiumpro' ;;
+           'Intel Celeron (686-class)'*)       ARCH='-march=pentiumpro' ;;
+           'Intel Core 2 (Merom) (686-class)'*) ARCH='-march=core2' ;;
+           'Intel Pentium 4 (686-class)'*)     ARCH='-march=pentium4' ;;
+           'Intel Pentium II (686-class)'*)    ARCH='-march=pentium2' ;;
+           'Intel Pentium III (686-class)'*)   ARCH='-march=pentium3' ;;
+           'Intel Pentium III Xeon (686-class)'*) ARCH='-march=pentium3' ;;
+           'Intel Pentium M (Dothan) (686-class)'*) ARCH='-march=pentium-m' ;;
            # Fallback classes
            *'(586-class)'*)                    ARCH='-march=pentium' ;;
            *'(486-class)'*)                    ARCH='-march=i486' ;;
@@ -115,10 +117,6 @@
        *\(68040*|*\ MC68040\ *) ARCH='-m68040' ;; # Untested
        *\(68060*|*\ MC68060\ *) ARCH='-m68060' ;; # Upgraded amiga 3000
     esac
-    case "$(egrep '^fpu0 ' /var/run/dmesg.boot)" in
-       *\(emulator\)*)         FEATURES="-msoft-float" ;;
-       *\(no\ math\ support\)*) FEATURES="-msoft-float" ;;
-    esac
     ;;
 
     mipseb|mipsel)
diff -r cefbe0b9f8f8 -r 5d087df80163 devel/cpuflags/files/subr_gcc
--- a/devel/cpuflags/files/subr_gcc     Thu Dec 04 10:47:36 2008 +0000
+++ b/devel/cpuflags/files/subr_gcc     Thu Dec 04 11:45:35 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: subr_gcc,v 1.3 2008/12/01 17:51:40 abs Exp $
+# $NetBSD: subr_gcc,v 1.4 2008/12/04 11:45:35 abs Exp $
 
 # Return gcc version string
 gcc_ver()
@@ -24,12 +24,20 @@
     #   -march=k6-3 -> -march=k6 -> -march=pentium -> -march=i486
     #
     # The format of table is
-    #   gcc_version_in_which_option_was_introduced     new_option  old_option
+    #   gcc_version_in_which_option_was_introduced : new_option : old_option
 
     $AWK -F: -v "flags=$gcc_arch_flags" -v "gcc_ver=$(gcc_ver $gcc)" '
-       { if (gcc_ver < $1){map[$2] = ""$3} }
-       END { FS=" "; split(flags,ar); for (af in ar) { flag=ar[af];
-        while (flag in map) {flag = map[flag]} print flag }}
+       { if (gcc_ver < $1) { map[$2] = ""$3 } }
+       END {
+           FS=" "; split(flags, flaglist);
+           for (af in flaglist) {
+               flag = flaglist[af];
+               while (flag in map) {
+                   flag = map[flag]
+               }
+               print flag
+           }
+       }
        ' <<EOD
 2.90:-march=i386:-mno-486
 2.90:-march=i486:-m486