diff options
author | abs <abs@pkgsrc.org> | 2009-03-04 00:32:44 +0000 |
---|---|---|
committer | abs <abs@pkgsrc.org> | 2009-03-04 00:32:44 +0000 |
commit | 9fa0f5ba7c9f1f3d97684f51a4da9e49d1cd74ff (patch) | |
tree | eb234633b0e54d1d04857a01c4a9bac5fc0ddc6c /devel/cpuflags | |
parent | c2001e5777b556c6b0267a7ee3531ee0a1e1596b (diff) | |
download | pkgsrc-9fa0f5ba7c9f1f3d97684f51a4da9e49d1cd74ff.tar.gz |
Updated devel/cpuflags to 1.39
- Add "Intel(r) Xeon(r) CPU E5430" and strip leading whitespace from
Solaris psrinfo output - from Jim Wise
- Add "Intel(R) Xeon(R) CPU E5310" - from Felix Resch
- Add "Genuine Intel(R) CPU T2500" - from Daniel Carosone
Diffstat (limited to 'devel/cpuflags')
-rw-r--r-- | devel/cpuflags/Makefile | 4 | ||||
-rwxr-xr-x | devel/cpuflags/files/subr_SunOS | 5 | ||||
-rw-r--r-- | devel/cpuflags/files/subr_x86 | 7 |
3 files changed, 10 insertions, 6 deletions
diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile index 3a26a611f42..0a7ef9ac949 100644 --- a/devel/cpuflags/Makefile +++ b/devel/cpuflags/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.144 2009/02/02 17:09:46 abs Exp $ +# $NetBSD: Makefile,v 1.145 2009/03/04 00:32:44 abs Exp $ -DISTNAME= cpuflags-1.38 +DISTNAME= cpuflags-1.39 CATEGORIES= devel sysutils MASTER_SITES= # empty DISTFILES= # empty diff --git a/devel/cpuflags/files/subr_SunOS b/devel/cpuflags/files/subr_SunOS index 5b23d7f473b..dc568a7b36d 100755 --- a/devel/cpuflags/files/subr_SunOS +++ b/devel/cpuflags/files/subr_SunOS @@ -1,4 +1,4 @@ -# $NetBSD: subr_SunOS,v 1.4 2009/01/28 23:30:50 abs Exp $ +# $NetBSD: subr_SunOS,v 1.5 2009/03/04 00:32:44 abs Exp $ AWK=nawk SED=sed @@ -15,7 +15,8 @@ END extract_hw_details() { hw_arch=$(/usr/bin/uname -m) - hw_psrinfo=$(psrinfo -pv | $AWK 'NR==3{print}') # Just gets the first CPU + # Just gets the first CPU + hw_psrinfo=$(psrinfo -pv | $AWK 'NR==3{sub(" *","");print}') } determine_arch() diff --git a/devel/cpuflags/files/subr_x86 b/devel/cpuflags/files/subr_x86 index 24c6707babf..9d858eae09d 100644 --- a/devel/cpuflags/files/subr_x86 +++ b/devel/cpuflags/files/subr_x86 @@ -1,4 +1,4 @@ -# $NetBSD: subr_x86,v 1.11 2009/02/02 17:09:46 abs Exp $ +# $NetBSD: subr_x86,v 1.12 2009/03/04 00:32:44 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 @@ -29,13 +29,14 @@ map_x86_brand_string() "VIA Nehemiah"*) echo '-march=c3' ;; "Genuine Intel(R) CPU T2400"*) echo '-march=core2' ;; + "Genuine Intel(R) CPU T2500"*) 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 "*) echo '-march=core2' ;; "Intel(R) Core 2 "*) echo '-march=core2' ;; + "Intel(R) Core(TM)2 "*) echo '-march=core2' ;; "Intel(R) Pentium(R) 4 CPU"*) if [ -n "$cpu_feature_SSE3" ] ; then echo '-march=prescott' @@ -45,6 +46,8 @@ map_x86_brand_string() "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' ;; + "Intel(R) Xeon(R) CPU E5310"*) echo '-march=core2' ;; + "Intel(r) Xeon(r) CPU E5430"*) echo '-march=core2' ;; "Pentium(R) Dual-Core CPU E5200"*) echo '-march=core2' ;; esac |