Fixed detection of Core2 CPUs (scipy ticket #349)

1 files changed, 7 insertions, 2 deletions

diff --git a/numpy/distutils/cpuinfo.py b/numpy/distutils/cpuinfo.py
index 70b3409a1..604459151 100644
--- a/numpy/distutils/cpuinfo.py
+++ b/numpy/distutils/cpuinfo.py
@@ -185,8 +185,13 @@ class linux_cpuinfo(cpuinfo_base):
         return self.is_PentiumIV() and self.has_sse3()
 
     def _is_Nocona(self):
-        return self.is_PentiumIV() and self.is_64bit()
-
+        return self.is_64bit() and self.is_i686()
+    
+    def _is_Core2(self):
+        return self.is_64bit() and self.is_Intel() and \
+               re.match(r'.*?Core\(TM\)2\b', \
+                        self.info[0]['model name']) is not None
+    
     def _is_Itanium(self):
         return re.match(r'.*?Itanium\b',
                         self.info[0]['family']) is not None