From 5fb00e4bd7c8f767a18377c91c99dacc2f74089f Mon Sep 17 00:00:00 2001 From: Vedant Kumar Date: Wed, 27 Jul 2016 23:01:55 +0000 Subject: Revert "[Driver] Compute effective target triples once per job (NFCI)" This reverts commit r275895 in order to address some post-commit review feedback from Eric Christopher (see: the list thread for r275895). llvm-svn: 276936 --- clang/lib/Driver/Driver.cpp | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'clang/lib/Driver/Driver.cpp') diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index 1b958520452..5af480ff537 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -2257,21 +2257,7 @@ InputInfo Driver::BuildJobsForActionNoCache( TC->getTriple().normalize()), BaseInput); - llvm::Triple EffectiveTriple; - const ArgList &Args = C.getArgsForToolChain(TC, BoundArch); - if (InputInfos.size() != 1) { - EffectiveTriple = llvm::Triple( - T->getToolChain().ComputeEffectiveClangTriple(Args)); - } else { - // Pass along the input type if it can be unambiguously determined. - EffectiveTriple = - llvm::Triple(T->getToolChain().ComputeEffectiveClangTriple( - Args, InputInfos[0].getType())); - } - if (CCCPrintBindings && !CCGenDiagnostics) { - // FIXME: We should be able to use the effective triple here, but doing so - // breaks some multi-arch tests. llvm::errs() << "# \"" << T->getToolChain().getTripleString() << '"' << " - \"" << T->getName() << "\", inputs: ["; for (unsigned i = 0, e = InputInfos.size(); i != e; ++i) { @@ -2281,7 +2267,7 @@ InputInfo Driver::BuildJobsForActionNoCache( } llvm::errs() << "], output: " << Result.getAsString() << "\n"; } else { - T->ConstructJob(C, *JA, Result, InputInfos, EffectiveTriple, + T->ConstructJob(C, *JA, Result, InputInfos, C.getArgsForToolChain(TC, BoundArch), LinkingOutput); } return Result; -- cgit v1.2.3