Add CodeGenOptions::{SoftFloat,FloatABI}, and update the all the (far too many) places to use this instead of using the backend -soft-float and -float-abi= options.

llvm-svn: 90127

2 files changed, 12 insertions, 0 deletions

diff --git a/clang/lib/Frontend/Backend.cpp b/clang/lib/Frontend/Backend.cpp
index 31c6c5027be..9dc109da65e 100644
--- a/clang/lib/Frontend/Backend.cpp
+++ b/clang/lib/Frontend/Backend.cpp
@@ -231,12 +231,18 @@ bool BackendConsumer::AddEmitPasses(std::string &Error) {
     }
     if (CodeGenOpts.DisableFPElim)
       BackendArgs.push_back("-disable-fp-elim");
+    if (!CodeGenOpts.FloatABI.empty()) {
+      BackendArgs.push_back("-float-abi");
+      BackendArgs.push_back(CodeGenOpts.FloatABI.c_str());
+    }
     if (!CodeGenOpts.LimitFloatPrecision.empty()) {
       BackendArgs.push_back("-limit-float-precision");
       BackendArgs.push_back(CodeGenOpts.LimitFloatPrecision.c_str());
     }
     if (CodeGenOpts.NoZeroInitializedInBSS)
       BackendArgs.push_back("-nozero-initialized-in-bss");
+    if (CodeGenOpts.SoftFloat)
+      BackendArgs.push_back("-soft-float");
     BackendArgs.push_back("-relocation-model");
     BackendArgs.push_back(CodeGenOpts.RelocationModel.c_str());
     if (llvm::TimePassesIsEnabled)
diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
index 488eeac32d9..7b37db55354 100644
--- a/clang/lib/Frontend/CompilerInvocation.cpp
+++ b/clang/lib/Frontend/CompilerInvocation.cpp
@@ -134,12 +134,18 @@ static void CodeGenOptsToArgs(const CodeGenOptions &Opts,
   }
   if (Opts.DisableFPElim)
     Res.push_back("-mdisable-fp-elim");
+  if (!Opts.FloatABI.empty()) {
+    Res.push_back("-mfloat-abi");
+    Res.push_back(Opts.FloatABI);
+  }
   if (!Opts.LimitFloatPrecision.empty()) {
     Res.push_back("-mlimit-float-precision");
     Res.push_back(Opts.LimitFloatPrecision);
   }
   if (Opts.NoZeroInitializedInBSS)
     Res.push_back("-mno-zero-initialized-bss");
+  if (Opts.SoftFloat)
+    Res.push_back("-msoft-float");
   if (Opts.UnwindTables)
     Res.push_back("-munwind-tables");
   if (Opts.RelocationModel != "pic") {