From c001f9cc16a345a08e51a4bf1a6b2642038aacfc Mon Sep 17 00:00:00 2001
From: Georgi Kodinov <joro@sun.com>
Date: Tue, 1 Sep 2009 16:39:13 +0300
Subject: [PATCH] Fixed a problem in how BUILD/check_cpu handles Core 2 Duo
 processors. This fixes the regression introduced in 5.1 that prevents 64 bit
 builds on Intel while still keeping the core2 hack operational so the cluster
 can build.

---
 BUILD/check-cpu | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/BUILD/check-cpu b/BUILD/check-cpu
index 9fa48adfb5f..c0e87a675cb 100755
--- a/BUILD/check-cpu
+++ b/BUILD/check-cpu
@@ -70,6 +70,11 @@ check_cpu () {
     Alpha*EV6*)
       cpu_arg="ev6";
       ;;
+    #Core 2 Duo  
+    *Intel*Core\(TM\)2*)
+      cpu_arg="nocona"
+      core2="yes"
+      ;;
     # Intel ia32
     *Intel*Core*|*X[eE][oO][nN]*)
       # a Xeon is just another pentium4 ...
@@ -134,10 +139,6 @@ check_cpu () {
     *i386*)
       cpu_arg="i386"
       ;;
-    #Core 2 Duo  
-    *Intel*Core\(TM\)2*)
-      cpu_arg="nocona"
-      ;;
     # Intel ia64
     *Itanium*)
       cpu_arg="itanium"