From 5f22d5263ada2d741c153118db1d69100a065bc8 Mon Sep 17 00:00:00 2001 From: Shuxin Yang Date: Wed, 14 Aug 2013 04:47:39 +0000 Subject: revert 188352 llvm-svn: 188353 --- clang/lib/Driver/Driver.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'clang/lib/Driver/Driver.cpp') diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index e301d89f3f7..32a7d1aafd3 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -1339,10 +1339,6 @@ Action *Driver::ConstructPhaseAction(const ArgList &Args, phases::ID Phase, types::ID Output = Args.hasArg(options::OPT_S) ? types::TY_LTO_IR : types::TY_LTO_BC; return new CompileJobAction(Input, Output); - } else if (Args.hasArg(options::OPT_emit_llvm)) { - types::ID Output = - Args.hasArg(options::OPT_S) ? types::TY_LLVM_IR : types::TY_LLVM_BC; - return new CompileJobAction(Input, Output); } else { return new CompileJobAction(Input, types::TY_PP_Asm); } @@ -1355,7 +1351,9 @@ Action *Driver::ConstructPhaseAction(const ArgList &Args, phases::ID Phase, } bool Driver::IsUsingLTO(const ArgList &Args) const { - if (Args.hasFlag(options::OPT_flto, options::OPT_fno_lto, false)) + // Check for -emit-llvm or -flto. + if (Args.hasArg(options::OPT_emit_llvm) || + Args.hasFlag(options::OPT_flto, options::OPT_fno_lto, false)) return true; // Check for -O4. -- cgit v1.2.3