From: Martin Mares <mj@ucw.cz>
Date: Sun, 16 Nov 2008 19:41:39 +0000 (+0100)
Subject: Configure: merged recognition of Nocona CPU's from master.
X-Git-Tag: holmes-import~149
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=c4321e565a9f94d720b45fe41903b0b1c012c9c9;p=libucw.git

Configure: merged recognition of Nocona CPU's from master.
---

diff --git a/ucw/perl/UCW/Configure/C.pm b/ucw/perl/UCW/Configure/C.pm
index a5b37fc7..cc42df21 100644
--- a/ucw/perl/UCW/Configure/C.pm
+++ b/ucw/perl/UCW/Configure/C.pm
@@ -130,7 +130,8 @@ Test("CPU_ARCH", "Checking for CPU architecture", sub {
 					elsif ($model >= 3) { $arch = "prescott"; }
 					else { $arch = "pentium4"; }
 				} elsif ($family == 6 && $gccver >= 3003) {
-					if ($model == 15) { $arch = "prescott"; }
+					if ($model == 23) { $arch = "nocona"; }
+					elsif ($model == 15) { $arch = "prescott"; }
 					elsif (($model == 9 || $model == 13) && $gccver >= 3004) { $arch = "pentium-m"; }
 					elsif ($model >= 7) { $arch = "pentium3"; }
 					elsif ($model >= 3) { $arch = "pentium2"; }