 @@ -1,14 +1,14 @@
-# $NetBSD: subr_NetBSD,v 1.9 2009/01/02 19:30:31 abs Exp $
+# $NetBSD: subr_NetBSD,v 1.10 2009/01/09 12:54:15 abs Exp $
 AWK=awk
 SED=sed
 display_hw_details()
+    {
     cat <<END
 OS		: '$(uname)'
 OS version	: '$(uname -r)'
 hw.model	: '$hw_model'
 hw.machine	: '$hw_machine'
 hw.machine_arch : '$hw_machine_arch'
 CPU		: '$cpu'
 @@ -45,27 +45,31 @@ extract_x86_cpu_vars()
     #      cpu_brand="BRAND" the CPU branding string
     echo "$cpu_details" | $AWK '
     { if (/cpu0:/ && !n) { sub("cpu0: ",""); n=1; print "cpu_name=\""$0"\"" } }
     /cpu0: ".*"/ { sub("[^\"]*", ""); print "cpu_brand="$0 }
     /cpu0: features/ {
 	sub(".*<","");
 	sub(">.*","");
 	gsub("[^,A-Z0-9]","_");
 	split($0, features, /,/)
 	for (f in features)
 	    print "cpu_feature_"features[f]"=1";
+	}
     /cpu0: family/ {
-	for (i = 2; i < NF; i = i + 2) { print "cpu_"$i"="($(i+1) + 0) }
+	for (i = 2; i < NF; i = i + 2) {
 	    f=$(i+1);
 	    sub(/^0/, "", f);
 	    print "cpu_"$i"="f
+	    }
+	}
+    '
+    }
 determine_arch()
+    {
     ARCH=
     # When adding $hw_model tests use maximum context (such as trailing space)
     case $hw_machine_arch in
     alpha)
 	# cpu0 at mainbus0: ID 0 (primary), 21164A-0 (unknown ...
 	case "$(egrep '^cpu0 ' /var/run/dmesg.boot)" in
 @@ -105,27 +109,27 @@ determine_arch()
     hppa)
 	case "$(egrep '^cpu0 ' /var/run/dmesg.boot)" in
 	   *\ PA7100\ *)       ARCH="-march=1.1 -mschedule=7100" ;; # untested
 	   *\ PA7150\ *)       ARCH="-march=1.1 -mschedule=7100" ;; # untested
 	   *\ PA7100LC\ *)     ARCH="-march=1.1 -mschedule=7100LC" ;; # untested
 	   *\ PA7200\ *)       ARCH="-march=1.1 -mschedule=7200" ;; # untested
 	   *\ PA7300LC\ *)     ARCH="-march=1.1 -mschedule=7300" ;; # B180L
 	   *\ PA8*)	       ARCH="-march=2.0 -mschedule=8000" ;; # untested
 	esac
 	;;
     i386 | x86_64)
 	include subr_x86	# this provides map_x86_brand_string()
-	ARCH=$(map_x86_brand_string "$cpu_brand")
+	ARCH=$(map_x86_brand_string)
 	if [ -z "$ARCH" ] ; then
 	case "$cpu_name" in
 	'AMD Athlon 64 X2 (686-class)'*)	   ARCH='-march=athlon64' ;;
 	'AMD Athlon 64 or Athlon 64 FX or Opteron '*) ARCH='-march=opteron' ;;
 	'AMD Athlon 64 or Sempron (686-class)'*)   ARCH='-march=athlon64' ;;
 	'AMD Athlon Model 4 (Thunderbird) '*)	   ARCH='-march=athlon-tbird' ;;
 	'AMD Dual-Core Opteron or Athlon 64 X2 '*) ARCH='-march=opteron' ;;
 	'AMD Family 10h (686-class)'*)   	   ARCH='-march=amdfam10' ;;
 	'AMD K6-2 (586-class)'*) 		   ARCH="-march=k6-2" ;;
 	# Intel PIII & earlier - later Intel handled by map_x86_brand_string
 	'Intel (686-class)'*)			   ARCH='-march=pentiumpro' ;;
 	'Intel Pentium II (686-class)'*)	   ARCH='-march=pentium2' ;;

 @@ -1,46 +1,58 @@
-# $NetBSD: subr_x86,v 1.8 2008/12/31 14:49:54 abs Exp $
+# $NetBSD: subr_x86,v 1.9 2009/01/09 12:54:15 abs Exp $
 # Apparently the only way to reliably determine the architecture of a recent
 # Intel CPU is to use the cpu brand string - as they reused family and
 # extended family bitflags... annoying
 # Even better, they appear to have reused brand strings between Northwood
 # and Prescott pentium4s. Thats just... special.
 # AMD, in contrast decided to keep things simple:
 # (thanks to Christoph Egger for this list)
 # Family 0x6: AMD K7
 # Family 0xf: AMD K8
 # Family 0x10: AMD Barcelona/Phenom
 # Family 0x11: AMD Turion Ultra
 map_x86_brand_string()
+    {
-    case "$1" in
+    case "$cpu_brand" in
-	"AMD-K6(tm)-III Processor"*) 		echo '-march=k6-3' ;;
+	"AMD*")
 	    case "$cpu_family-$cpu_model" in
 -6 | 5-7 )			echo '-march=k6' ;;
 -8 )				echo '-march=k6-2' ;;
 -9 )				echo '-march=k6-3' ;;
 -1 | 6-2 | 6-3 )		echo '-march=athlon' ;;
 -4 | 6-6 | 6-7 | 6-8 | 6-a ) 	echo '-march=athlon-4' ;;
 	    esac
 	    ;;
 	"VIA Nehemiah"*)			echo '-march=c3' ;;
 	"Genuine Intel(R) CPU           T2400"*) echo '-march=core2' ;;
 	"Intel(R) Atom(TM) CPU N270 "*)		echo '-march=prescott' ;;#So far
 	"Intel(R) Celeron(R) CPU        E1400"*) echo '-march=core2' ;;
 	"Intel(R) Celeron(R) CPU 2.40GHz")	echo '-march=pentium4' ;;
 	"Intel(R) Celeron(R) M processor "*)	echo '-march=pentium-m' ;;
 	"Intel(R) Celeron(TM) CPU                1400MHz") echo '-march=pentium3' ;;
 	"Intel(R) Core(TM)2 CPU "*) 		echo '-march=core2' ;;
 	"Intel(R) Core(TM)2 Duo CPU "*)		echo '-march=core2' ;;
 	"Intel(R) Core(TM)2 Quad  CPU"*)	echo '-march=core2' ;;
-	"Intel(R) Pentium(R) 4 CPU 2.00GHz")	echo '-march=pentium4' ;;
+	"Intel(R) Pentium(R) 4 CPU"*)
-	"Intel(R) Pentium(R) 4 CPU 2.80GHz")	echo '-march=pentium4' ;;
+	    if [ -n "$cpu_feature_SSE3" ] ; then
-	"Intel(R) Pentium(R) 4 CPU 3.00GHz")	echo '-march=prescott' ;;
+						echo '-march=prescott'
-	"Intel(R) Pentium(R) 4 CPU 3.20GHz")	echo '-march=prescott' ;;
+	    else
-	"Intel(R) Pentium(R) D CPU "*)		echo '-march=prescott' ;;
+		     				echo '-march=pentium4'
 	    fi ;;
 	"Intel(R) Pentium(R) M processor "*)	echo '-march=pentium-m' ;;
 	"Intel(R) Xeon(R) CPU            3040"*) echo '-march=core2' ;;
 	"Intel(R) Xeon(R) CPU            3050"*) echo '-march=core2' ;;
 	"Pentium(R) Dual-Core  CPU      E5200"*) echo '-march=core2' ;;
     esac
+    }
 flags_fixup_x86arch()
+    {
     arch=$1
     features=$2
     # Fixup ARCH for x86

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.137 2009/01/02 19:30:31 abs Exp $
+# $NetBSD: Makefile,v 1.138 2009/01/09 12:54:15 abs Exp $
-DISTNAME=	cpuflags-1.31
+DISTNAME=	cpuflags-1.32
 CATEGORIES=	devel sysutils
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 MAINTAINER=	abs@NetBSD.org
 COMMENT=	Determine compiler flags to best target current cpu
 PKG_DESTDIR_SUPPORT=	user-destdir
 ONLY_FOR_PLATFORM= NetBSD-*-* Linux-*-* SunOS-*-* FreeBSD-*-*
 USE_LANGUAGES=	# empty
 NO_CHECKSUM=	yes