Index: configure
===================================================================
--- configure	（版本 23459）
+++ configure	（工作副本）
@@ -1845,7 +1845,7 @@
       AuthenticAMD)
         proc=k8;;
       GenuineIntel)
-        case "$pmodel" in
+        case "$pfamily" in
         6) proc=core2;;
         *)
           # 64-bit prescotts exist, but as far as GCC is concerned they
@@ -1876,6 +1876,9 @@
       fi
       # --- Intel processors ---
       if test "$proc" = "core2"; then
+        cc_check -march=$proc $cpuopt=$proc || proc='x86-64'
+      fi
+      if test "$proc" = "x86-64"; then
         cc_check -march=$proc $cpuopt=$proc || proc=nocona
       fi
       if test "$proc" = "nocona"; then