--- cpuinfo.sh.orig	2007-10-11 12:17:50.953303532 -0400
+++ cpuinfo.sh	2007-10-11 12:18:02.214585553 -0400
@@ -58,10 +58,16 @@
 
 do_x86()
 {
+
+CFLAGS=-O
+if test $IsDarwin = yes; then
+   CFLAGS="$CFLAGS -fno-pic -Wl,-read_only_relocs -Wl,suppress"
+fi
+
 if test -r /proc/cpuinfo; then
 	_cpuinfo="cat /proc/cpuinfo"
 else
-	$CC -o cpuinfo utils/cpuinfo.c
+	$CC $CFLAGS -o cpuinfo utils/cpuinfo.c
 	_cpuinfo="./cpuinfo"
 fi
 
@@ -156,14 +162,18 @@
 			   fi
 			   ;;
 			6) iproc=686
-			   if test "$pmodel" -ge 7; then
+                           if test "$pmodel" -ge 15; then
+                                proc=nocona
+                           elif test "$pmodel" -ge 13; then
+                                proc=pentium-m
+			   elif test "$pmodel" -ge 7; then
 				proc=pentium3
 			   elif test "$pmodel" -ge 3; then
 				proc=pentium2
 			   else
 				proc=i686
 			   fi
-			   ;;
+                           ;;
 			15) proc=pentium4
 			   ;;
 			*) proc=pentium4