diff options
| author | Shuxin Yang <shuxin.llvm@gmail.com> | 2013-08-14 04:47:39 +0000 |
|---|---|---|
| committer | Shuxin Yang <shuxin.llvm@gmail.com> | 2013-08-14 04:47:39 +0000 |
| commit | 5f22d5263ada2d741c153118db1d69100a065bc8 (patch) | |
| tree | 6d1dae3fb6df6c1df4d20b72d71f904ab9ca8464 /clang/lib/Driver/Driver.cpp | |
| parent | 538a17691cb81ced5f20462f568e848fd572f2cd (diff) | |
| download | bcm5719-llvm-5f22d5263ada2d741c153118db1d69100a065bc8.tar.gz bcm5719-llvm-5f22d5263ada2d741c153118db1d69100a065bc8.zip | |
revert 188352
llvm-svn: 188353
Diffstat (limited to 'clang/lib/Driver/Driver.cpp')
| -rw-r--r-- | clang/lib/Driver/Driver.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
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. |
