commit 42a7fe25462bf539ed68fa34e781654d525bceef
author Miao Wang <miaowang@google.com> Fri Apr 01 01:50:43 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 01 01:50:43 2016 +0000
tree 68f2dccbbfee43387d665881a22ec8adfa439d20
parent 336355cfeae22d5f78f2b26d6439f584b1a49f49
parent 678ecd14f649a27df2e8186a0914b57d639b63b1

Merge "Add __HOST__ check for bcc-compat"
am: 678ecd1

* commit '678ecd14f649a27df2e8186a0914b57d639b63b1':
  Add __HOST__ check for bcc-compat

Change-Id: I0ec780a1a95c625ac384322c3163bc0f272628eb

lib/Support/CompilerConfig.cpp

diff --git a/lib/Support/CompilerConfig.cpp b/lib/Support/CompilerConfig.cpp
index 2baac11..68d943a 100644
--- a/lib/Support/CompilerConfig.cpp
+++ b/lib/Support/CompilerConfig.cpp
@@ -236,7 +236,7 @@
 #if defined (PROVIDE_X86_CODEGEN)
 // PROVIDE_X86_CODEGEN is defined for both x86 and x86_64
   case llvm::Triple::x86_64:
-#if defined(DEFAULT_X86_64_CODEGEN)
+#if defined(DEFAULT_X86_64_CODEGEN) && !defined(__HOST__)
     setCPU(llvm::sys::getHostCPUName());
 #else
     // generic fallback for 64bit x86 targets