Revert "Disallow using -fmodules with -no-integrated-as."

Per comment from Benjamin Kramer, this isn't portable (yet).  I'll come up
with a better fix.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@176876 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 2 insertions, 14 deletions

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index ef759ff6d3..62b1febd52 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -1429,18 +1429,12 @@ static bool ShouldDisableCFI(const ArgList &Args,
                        Default);
 }
 
-static bool ShouldUseIntegratedAssembler(const ArgList &Args,
-                                         const ToolChain &TC) {
+static bool ShouldDisableDwarfDirectory(const ArgList &Args,
+                                        const ToolChain &TC) {
   bool IsIADefault = TC.IsIntegratedAssemblerDefault();
   bool UseIntegratedAs = Args.hasFlag(options::OPT_integrated_as,
                                       options::OPT_no_integrated_as,
                                       IsIADefault);
-  return UseIntegratedAs;
-}
-
-static bool ShouldDisableDwarfDirectory(const ArgList &Args,
-                                        const ToolChain &TC) {
-  bool UseIntegratedAs = ShouldUseIntegratedAssembler(Args, TC);
   bool UseDwarfDirectory = Args.hasFlag(options::OPT_fdwarf_directory_asm,
                                         options::OPT_fno_dwarf_directory_asm,
                                         UseIntegratedAs);
@@ -2784,12 +2778,6 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
       CmdArgs.push_back("-fmodules");
       HaveModules = true;
     }
-
-    if (HaveModules && !ShouldUseIntegratedAssembler(Args, getToolChain())) {
-      D.Diag(diag::err_drv_modules_integrated_as);
-      D.Diag(diag::note_drv_modules_integrated_as);
-      return;
-    }
   }
 
   // If a module path was provided, pass it along. Otherwise, use a temporary