commit d8563169c10620e696106542e517f9fbd65984d2
author Yong Chen <yong.a.chen@intel.com> Mon Jul 20 17:28:19 2015 +0800
committer Yong Chen <yong.a.chen@intel.com> Wed Jul 22 15:06:31 2015 +0800
tree 5b0136f5bd5309772552d835e53dc0b3ef73eaac
parent 767dd80cb44a9e973405672d0beb54d741382592

Avoid cpu mismatch to ARM during cross compiling

Change-Id: I80ebcdbd433e5bbbcf9c9d3a7bda6743037c0aad
Signed-off-by: Yong Chen <yong.a.chen@intel.com>

lib/Support/CompilerConfig.cpp

diff --git a/lib/Support/CompilerConfig.cpp b/lib/Support/CompilerConfig.cpp
index eac26aa..71cd7cc 100644
--- a/lib/Support/CompilerConfig.cpp
+++ b/lib/Support/CompilerConfig.cpp
@@ -155,7 +155,9 @@
 #if defined(TARGET_BUILD)
     if (!getProperty("debug.rs.arm-no-tune-for-cpu")) {
 #ifndef FORCE_CPU_VARIANT_32
+#ifdef DEFAULT_ARM_CODEGEN
       setCPU(llvm::sys::getHostCPUName());
+#endif
 #else
 #define XSTR(S) #S
 #define STR(S) XSTR(S)
@@ -175,7 +177,9 @@
 #if defined(TARGET_BUILD)
     if (!getProperty("debug.rs.arm-no-tune-for-cpu")) {
 #ifndef FORCE_CPU_VARIANT_64
+#ifdef DEFAULT_ARM64_CODEGEN
       setCPU(llvm::sys::getHostCPUName());
+#endif
 #else
 #define XSTR(S) #S
 #define STR(S) XSTR(S)