# HG changeset patch
# User diego
# Date 1177095429 0
# Node ID 41d0425635082a4f4012d762955845cd9de45cd3
# Parent  7fa1afcfb772d843745a14ca1a2429a938c0227c
Intel's Conroe-L makes use of extended models, so adjust CPU detection
routines accordingly.
patch by Zuxy Meng, zuxy.meng gmail com

diff -r 7fa1afcfb772 -r 41d042563508 configure
--- a/configure	Fri Apr 20 14:23:27 2007 +0000
+++ b/configure	Fri Apr 20 18:57:09 2007 +0000
@@ -1641,7 +1641,7 @@
 	fi
 	;;
     6) iproc=686
-	if test "$pmodel" -eq 15; then
+	if test "$pmodel" -ge 15; then
 		proc=core2
 	elif test "$pmodel" -eq 9 -o "$pmodel" -ge 13; then
 		proc=pentium-m
diff -r 7fa1afcfb772 -r 41d042563508 cpuinfo.c
--- a/cpuinfo.c	Fri Apr 20 14:23:27 2007 +0000
+++ b/cpuinfo.c	Fri Apr 20 18:57:09 2007 +0000
@@ -241,10 +241,9 @@
     stepping = regs.eax & 0xf;
 
     if (family == 0xf)
-    {
       family += (regs.eax >> 20) & 0xff;
+    if (family == 0xf || family == 6)
       model += ((regs.eax >> 16) & 0xf) << 4;
-    }
 
     printf("cpu family\t: %d\n"
            "model\t\t: %d\n"