 @@ -1,45 +1,43 @@
-# $NetBSD: subr_NetBSD,v 1.5 2008/12/05 00:41:31 abs Exp $
+# $NetBSD: subr_NetBSD,v 1.6 2008/12/08 17:40:14 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 details	: '$cpu'
+CPU		: '$cpu'
 $cpu_details
 END
     sed -n -e 's/^/    /' -e '/^    cpu/p' /var/run/dmesg.boot
     if [ -x /usr/sbin/cpuctl ]; then
 	cpuctl identify 0
     fi
+    }
 extract_hw_details()
+    {
     hw_model=$(sysctl -n hw.model | sed 's/^  *//')
     hw_machine=$(sysctl -n hw.machine)
     hw_machine_arch=$(sysctl -n hw.machine_arch)
     if [ "$hw_machine_arch" = i386 -o "$hw_machine_arch" = x86_64 ] ; then
 	if [ -x /usr/sbin/cpuctl ] ; then
-	    cpu=$(cpuctl identify 0|awk '/cpu0:/{sub("cpu0: ","");print;exit}')
+	    cpu_details="$(cpuctl identify 0 | grep ^cpu0:)"
 	else
-	    cpu=$(awk '/cpu0:/{sub("cpu0: ","");print;exit}'</var/run/dmesg.boot)
+	    cpu_details="$(grep ^cpu0: /var/run/dmesg.boot)"
 	fi
 	cpu=$(echo "$cpu_details"|awk '/cpu0:/{sub("cpu0: ","");print;exit}')
     fi
     # We're almost certainly crosscompiling
     if [ -n "$MACHINE" -a $hw_machine != "$MACHINE" ]; then
 	echo
 	exit
     fi
+    }
 determine_arch()
+    {
     ARCH=
     # When adding $hw_model tests use maximum context (such as trailing space)
 @@ -84,49 +82,53 @@ 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)
 	case "$cpu" in
-	    'AMD Athlon 64 or Athlon 64 FX or Opteron '*) ARCH='-march=opteron' ;;
+	'AMD Athlon 64 X2 (686-class)'*)	   ARCH='-march=athlon64' ;;
-	    'AMD Athlon 64 or Sempron (686-class)'*) ARCH='-march=athlon64' ;;
+	'AMD Athlon 64 or Athlon 64 FX or Opteron '*) ARCH='-march=opteron' ;;
-	    'AMD Dual-Core Opteron or Athlon 64 X2 '*) ARCH='-march=opteron' ;;
+	'AMD Athlon 64 or Sempron (686-class)'*)   ARCH='-march=athlon64' ;;
-	    'AMD Athlon Model 4 (Thunderbird) '*) ARCH='-march=athlon-tbird' ;;
+	'AMD Athlon Model 4 (Thunderbird) '*)	   ARCH='-march=athlon-tbird' ;;
-	    'Intel (686-class)'*)		ARCH='-march=pentiumpro' ;;
+	'AMD Dual-Core Opteron or Athlon 64 X2 '*) ARCH='-march=opteron' ;;
-	    'Intel Celeron (686-class)'*)	ARCH='-march=pentiumpro' ;;
+	'Intel (686-class)'*)			   ARCH='-march=pentiumpro' ;;
-	    'Intel Core 2 (Merom) (686-class)'*) ARCH='-march=core2' ;;
+	'Intel Celeron (686-class)'*)		   ARCH='-march=pentiumpro' ;;
-	    'Intel Pentium 4 (686-class)'*)	ARCH='-march=pentium4' ;;
+	'Intel Core 2 (Merom) (686-class)'*)	   ARCH='-march=core2' ;;
-	    'Intel Pentium II (686-class)'*)	ARCH='-march=pentium2' ;;
+	'Intel Pentium 4 (686-class)'*)		   ARCH='-march=pentium4' ;;
-	    'Intel Pentium III (686-class)'*)	ARCH='-march=pentium3' ;;
+	'Intel Pentium II (686-class)'*)	   ARCH='-march=pentium2' ;;
-	    'Intel Pentium III Xeon (686-class)'*) ARCH='-march=pentium3' ;;
+	'Intel Pentium III (686-class)'*)	   ARCH='-march=pentium3' ;;
-	    'Intel Pentium M (Dothan) (686-class)'*) ARCH='-march=pentium-m' ;;
+	'Intel Pentium III (Katmai) (686-class)'*) ARCH='-march=pentium3' ;;
-	    # Fallback classes
+	'Intel Pentium III Xeon (686-class)'*)	   ARCH='-march=pentium3' ;;
-	    *'(586-class)'*)			ARCH='-march=pentium' ;;
+	'Intel Pentium M (Dothan) (686-class)'*)   ARCH='-march=pentium-m' ;;
-	    *'(486-class)'*)			ARCH='-march=i486' ;;
+	'Intel Pentium M (Yonah) (686-class)'*)	   ARCH='-march=pentium-m' ;;
 	# Fallback classes
 	*'(586-class)'*)			   ARCH='-march=pentium' ;;
 	*'(486-class)'*)			   ARCH='-march=i486' ;;
 	esac
 	;;
     m68k) case $hw_model in				   # Examples
-	*\(68020*|*\ MC68020\ *) ARCH='-m68020'	;; # Untested
+	*\(68020*|*\ MC68020\ *) ARCH='-m68020' ;; # Untested
-	*\(68030*|*\ MC68030\ *) ARCH='-m68030'	;; # Mac LC III
+	*\(68030*|*\ MC68030\ *) ARCH='-m68030' ;; # Mac LC III
-	*\(68040*|*\ MC68040\ *) ARCH='-m68040'	;; # Untested
+	*\(68040*|*\ MC68040\ *) ARCH='-m68040' ;; # Untested
-	*\(68060*|*\ MC68060\ *) ARCH='-m68060'	;; # Upgraded amiga 3000
+	*\(68060*|*\ MC68060\ *) ARCH='-m68060' ;; # Upgraded amiga 3000
     esac
     ;;
     mipseb|mipsel)
 	# cpu0 at mainbus0: QED R4600 Orion CPU (0x2020) Rev. 2.0 with ...
 	case $hw_model in
 	    Infineon\ ADM5120)		ARCH='-march=4kc' ;;
 	    *)
 	    case "$(egrep '^cpu0 ' /var/run/dmesg.boot)" in
 		*\ MIPS\ R2000\ *)	ARCH="-march=r2000" ;;
 		*\ MIPS\ R3000\ *)	ARCH="-march=r3000" ;;
 		*\ MIPS\ R3000A\ *)	ARCH="-march=r3000" ;;
 		*\ Toshiba\ TX3912\ *)	ARCH="-march=r3900" ;;
 @@ -149,61 +151,72 @@ determine_arch()
 \ *)			ARCH='-mcpu=601'	;; # Untested
 \ *)			ARCH='-mcpu=602'	;; # Untested
 \ *)			ARCH='-mcpu=603'	;; # Untested
 e\ *|603ev\ *)	ARCH='-mcpu=603e'	;; # Umax C500 / PM4400
 \ *)			ARCH='-mcpu=604'	;; # Mac 8500
 e\ *)		ARCH='-mcpu=604e'	;; # upgr B&W G3
 ev\ *)		ARCH='-mcpu=604e'	;; # usually 604e
 \ *)			ARCH='-mcpu=620'	;; # Untested
 \ *)		ARCH='-mcpu=7400'	;; # AGP G4/400 Mac
 \ *)			ARCH='-mcpu=740'	;; # Untested
 \ *)		ARCH='-mcpu=7400'	;; # powerbook g4
 A\ *)		ARCH='-mcpu=7450'	;; #
 \ *)		ARCH='-mcpu=7450'	;; # tibook 550
-\ *)		       ARCH='-mcpu=750'       ;; # orig. iBook
+\ *)		       ARCH='-mcpu=750'	      ;; # orig. iBook
     esac ;;
     sparc | sparc64) case " $hw_model" in			   # Examples
 	*[\ \(]MB86900/1A*)	ARCH='-mcpu=cypress'		;; # ss1+
 	*[\ \(]L64811*)		ARCH='-mcpu=cypress'		;; # sun4/sun4c
 	*[\ \(]CY7C601*)	ARCH='-mcpu=cypress'		;; # ss2
 	*[\ \(]W8601/8701*)	ARCH='-mcpu=cypress'		;; # elc
-	*[\ \(]MB86904*)	ARCH='-mcpu=supersparc'	;; # ss5 usparc
+	*[\ \(]MB86904*)	ARCH='-mcpu=supersparc' ;; # ss5 usparc
-	*[\ \(]MB86907*)	ARCH='-mcpu=supersparc'	;; # ss5 usparc
+	*[\ \(]MB86907*)	ARCH='-mcpu=supersparc' ;; # ss5 usparc
-	*[\ \(]TMS390S10*)	ARCH='-mcpu=supersparc'	;; # classic  "
+	*[\ \(]TMS390S10*)	ARCH='-mcpu=supersparc' ;; # classic  "
-	*[\ \(]TMS390Z50*)	ARCH='-mcpu=supersparc'	;; # ss10/ss20
+	*[\ \(]TMS390Z50*)	ARCH='-mcpu=supersparc' ;; # ss10/ss20
-	*[\ \(]RT620/625*)	ARCH='-mcpu=hypersparc'	;; # ss20 ross
+	*[\ \(]RT620/625*)	ARCH='-mcpu=hypersparc' ;; # ss20 ross
 	*[\ \(]MB86930*)	ARCH='-mcpu=sparclite'		;; # from gcc
 	*[\ \(]MB86934*)	ARCH='-mcpu=sparclite'		;; # from gcc
 	# under 1.5.1 -mcpu=ultrasparc chokes egcs-2.91.66 compiling perl
 	*[\ \(]SUNW,UltraSPARC*) ARCH='-mcpu=v9'		;; # Ultra
     esac ;;
     vax) # No VAX specific gcc optimisations available
 	NOARCH=1
 	;;
     esac
     echo $ARCH
+    }
 determine_features()
+    {
     FEATURES=
     case $hw_machine_arch in
-	i386)
+	i386 | x86_64)
-	    if [ "$(sysctl -n machdep.sse2)" = 1 ] ; then
+	    # Set cpu_feature_FOO=1 for each 'FOO' feature reported
 	    eval $(echo "$cpu_details" | awk -F , '
 	    /cpu0: features/ {
 		sub(".*<","");
 		sub(">.*","");
 		gsub("[^,A-Z0-9]","_");
 		for (i = 1; i < NR; i++) { print "cpu_feature_"$i"=1" } }
 		')
 	    if [ -n "$cpu_feature_SSE3" ] ; then
 		FEATURES="-mfpmath=sse -msse3"
 	    elif [ -n "$cpu_feature_SSE2" ] ; then
 		FEATURES="-mfpmath=sse -msse2"
-	    elif [ "$(sysctl -n machdep.sse)" = 1 ] ; then
+	    elif [ -n "$cpu_feature_SSE" ] ; then
 		FEATURES="-mfpmath=sse -msse"
 	    fi
 	    ;;
 	m68k)
 	    case "$(egrep '^fpu0 ' /var/run/dmesg.boot)" in
 		*\(emulator\)*)		FEATURES="-msoft-float" ;;
 		*\(no\ math\ support\)*) FEATURES="-msoft-float" ;;
 	    esac
 	    ;;
     esac
     echo $FEATURES
+    }

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.127 2008/12/05 00:41:31 abs Exp $
+# $NetBSD: Makefile,v 1.128 2008/12/08 17:40:14 abs Exp $
-DISTNAME=	cpuflags-1.21
+DISTNAME=	cpuflags-1.22
 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

 @@ -1,14 +1,14 @@
-# $NetBSD: subr_gcc,v 1.4 2008/12/04 11:45:35 abs Exp $
+# $NetBSD: subr_gcc,v 1.5 2008/12/08 17:40:14 abs Exp $
 # Return gcc version string
 gcc_ver()
+    {
     gcc=$1
     ${gcc} -dumpversion | $SED -e 's/^[^0-9\.]\{1,\}//' -e 's/[^0-9\.]\{1,\}$//'
+    }
 gcc_ser()
+    {
     gcc=$1
     gcc_ver $gcc | $AWK -F. '{ print ($1*1000+$2)}'
+    }
 @@ -99,16 +99,22 @@ gcc_fixup_arch_flags()
 .4:-march=athlon-fx:-march=athlon-xp
 .4:-march=athlon64:-march=athlon-xp
 .4:-march=c3-2:-march=c3
 .4:-march=k8:-march=athlon-xp
 .4:-march=nocona:-march=pentium4
 .4:-march=opteron:-march=athlon-xp
 .4:-march=pentium-m:-march=pentium3
 .4:-march=pentium3m:-march=pentium3
 .4:-march=pentium4m:-march=pentium4
 .4:-march=prescott:-march=pentium4
 .4:-msse3:
 .2:-m3dnow:
 .2:-march=native:
-.3:-march=core2:-march=pentium3
+.3:-march=amdfam10:-march=athlon64
 .3:-march=athlon64-sse3:-march=athlon64
 .3:-march=barcelona:-march=athlon64
 .3:-march=core2:-march=pentium-m
 .3:-march=geode:-march=k6-3
 .3:-march=k8-sse3:-march=k8
 .3:-march=opteron-sse3:-march=opteron
 EOD
+    }