commit 7fb0af86e33f382a8e4a8f23cc1ab471b7134995
author Stephen Hines <srhines@google.com> Fri Oct 17 08:52:15 2014 -0700
committer Stephen Hines <srhines@google.com> Fri Oct 17 13:12:14 2014 -0700
tree cceda6dd5deb2c4d47529cb8725c6a96dc438abb
parent ebefa3846413241e117789d25518e687610fa6b2

Bring in fixes for Cortex-A53 errata.

Bug: 18034609

Change-Id: I0ef0ead418f797946e0b59068bca8f9fd08d3348

lib/Driver/Tools.cpp

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index e3532aa..37fef56 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -898,6 +898,19 @@
     CmdArgs.push_back("-aarch64-strict-align");
   }
 
+  if (Arg *A = Args.getLastArg(options::OPT_mfix_cortex_a53_835769,
+                               options::OPT_mno_fix_cortex_a53_835769)) {
+    CmdArgs.push_back("-backend-option");
+    if (A->getOption().matches(options::OPT_mfix_cortex_a53_835769))
+      CmdArgs.push_back("-aarch64-fix-cortex-a53-835769=1");
+    else
+      CmdArgs.push_back("-aarch64-fix-cortex-a53-835769=0");
+  } else if (Triple.getEnvironment() == llvm::Triple::Android) {
+    // Enabled A53 errata (835769) workaround by default on android
+    CmdArgs.push_back("-backend-option");
+    CmdArgs.push_back("-aarch64-fix-cortex-a53-835769=1");
+  }
+
   // Setting -mno-global-merge disables the codegen global merge pass. Setting
   // -mglobal-merge has no effect as the pass is enabled by default.
   if (Arg *A = Args.getLastArg(options::OPT_mglobal_merge,