commit f084384e0d00eb169928199bf1093e7f0a53358a
author Tim Murray <timmurray@google.com> Wed Oct 01 23:31:46 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 01 23:31:46 2014 +0000
tree 20e0b24d76d7b31699c7bbd6b8549f0b817f2d35
parent 8f5c2a1c1392a6d6bdb5700f73eeadd7b01ea0b7
parent c7d73a063bfd38639c6fe823b2b45e983df0e363

Merge "Remove Atom workaround." into lmp-dev

tools/bcc_compat/Main.cpp

diff --git a/tools/bcc_compat/Main.cpp b/tools/bcc_compat/Main.cpp
index 98a67fa..dbdc02d 100644
--- a/tools/bcc_compat/Main.cpp
+++ b/tools/bcc_compat/Main.cpp
@@ -170,14 +170,10 @@
     config->setFeatureString(fv);
   }
 
-  // FIXME: Atom code generation in LLVM 3.5 seems broken.
-  // Bug: 15343872
-#if 0
   // Compatibility mode on x86 requires atom code generation.
   if (config->getTriple().find("i686") != std::string::npos) {
     config->setCPU("atom");
   }
-#endif
 
   // Setup the config according to the value of command line option.
   if (OptPIC) {