Text archives Help
- From: bigler@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r1405 - trunk/CMake
- Date: Tue, 29 May 2007 16:44:36 -0600 (MDT)
Author: bigler
Date: Tue May 29 16:44:36 2007
New Revision: 1405
Modified:
trunk/CMake/ConfigCompilerFlags.cmake
Log:
Fix the logic for processor selection on CPU_FAMILY == 6 (Pentium-M,
Core, Core2).
Modified: trunk/CMake/ConfigCompilerFlags.cmake
==============================================================================
--- trunk/CMake/ConfigCompilerFlags.cmake (original)
+++ trunk/CMake/ConfigCompilerFlags.cmake Tue May 29 16:44:36 2007
@@ -134,22 +134,22 @@
ENDIF(VENDOR_ID MATCHES "AuthenticAMD")
IF(VENDOR_ID MATCHES "GenuineIntel")
IF(CPU_FAMILY EQUAL 6)
- IF(MODEL GREATER 13)
+ IF(MODEL EQUAL 15) # (F)
+ # This is likely a Core 2
+ APPEND_TO_STRING(GCC_ARCH "nocona")
+ APPEND_TO_STRING(GCC_ARCH "prescott")
+ ENDIF(MODEL EQUAL 15)
+ IF(MODEL EQUAL 14) # (E)
+ # This is likely a Core Single or Core Duo. This doesn't
+ # support EM64T.
+ APPEND_TO_STRING(GCC_ARCH "prescott")
+ ENDIF(MODEL EQUAL 14)
+ IF(MODEL LESS 14) #(0-D)
# This is likely a Pentium3, Pentium M. Some pentium 3s don't
# support sse2, in that case fall back to the i686 code.
APPEND_TO_STRING(GCC_ARCH "pentium-m")
APPEND_TO_STRING(INTEL_OPT "-xB -tpp7")
- ELSE(MODEL GREATER 13)
- IF(MODEL GREATER 15)
- # This is likely a Core Single or Core Duo. This doesn't
- # support EM64T.
- APPEND_TO_STRING(GCC_ARCH "prescott")
- ELSE(MODEL GREATER 15)
- # This is likely a Core 2
- APPEND_TO_STRING(GCC_ARCH "nocona")
- APPEND_TO_STRING(GCC_ARCH "prescott")
- ENDIF(MODEL GREATER 15)
- ENDIF(MODEL GREATER 13)
+ ENDIF(MODEL LESS 14)
ENDIF(CPU_FAMILY EQUAL 6)
IF(CPU_FAMILY EQUAL 15)
# These are your Pentium 4 and friends
@@ -239,8 +239,8 @@
MACRO(SET_FLAGS FLAG NEW_VALUE)
IF(${NEW_VALUE})
- FIRST_TIME_MESSAGE("Setting compiler flags:")
- FIRST_TIME_MESSAGE("${NEW_VALUE} = ${${NEW_VALUE}}")
+# FIRST_TIME_MESSAGE("Setting compiler flags:")
+# FIRST_TIME_MESSAGE("${NEW_VALUE} = ${${NEW_VALUE}}")
FIRST_TIME_SET(${FLAG} "${${NEW_VALUE}}" CACHE STRING "Default compiler
flags" FORCE)
ENDIF(${NEW_VALUE})
ENDMACRO(SET_FLAGS)
- [MANTA] r1405 - trunk/CMake, bigler, 05/29/2007
Archive powered by MHonArc 2.6.16.