[cfe-commits] r118419 - /cfe/trunk/lib/Driver/ToolChains.cpp

[Roman Divacky]

Author: rdivacky
Date: Mon Nov  8 11:46:39 2010
New Revision: 118419

URL: http://llvm.org/viewvc/llvm-project?rev=118419&view=rev
Log:
Use integrated-as for processing .s files on FreeBSD. Copied
from Linux/OpenBSD code.


Modified:
    cfe/trunk/lib/Driver/ToolChains.cpp

Modified: cfe/trunk/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=118419&r1=118418&r2=118419&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains.cpp Mon Nov  8 11:46:39 2010
@@ -1098,11 +1098,18 @@
   else
     Key = JA.getKind();
 
+  bool UseIntegratedAs = C.getArgs().hasFlag(options::OPT_integrated_as,
+                                             options::OPT_no_integrated_as,
+                                             IsIntegratedAssemblerDefault());
+
   Tool *&T = Tools[Key];
   if (!T) {
     switch (Key) {
     case Action::AssembleJobClass:
-      T = new tools::freebsd::Assemble(*this); break;
+      if (UseIntegratedAs)
+        T = new tools::ClangAs(*this);
+      else
+        T = new tools::freebsd::Assemble(*this);
     case Action::LinkJobClass:
       T = new tools::freebsd::Link(*this); break;
     default: