diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2009-12-23 00:47:42 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2009-12-23 00:47:42 +0000 |
| commit | e0d2691b8812fd9b80b39c3d57fab4df1d061ad8 (patch) | |
| tree | 01b9a0aeb697ef56cc9fdc3c0ca692864bcc724a | |
| parent | 9df5c6dfc308f66ee21a25f1f7df7e9004d97e17 (diff) | |
| download | bcm5719-llvm-e0d2691b8812fd9b80b39c3d57fab4df1d061ad8.tar.gz bcm5719-llvm-e0d2691b8812fd9b80b39c3d57fab4df1d061ad8.zip | |
Driver: Fix '... -O4 -O0 ...', which was generating bitcode.
llvm-svn: 91962
| -rw-r--r-- | clang/lib/Driver/Driver.cpp | 7 | ||||
| -rw-r--r-- | clang/test/Driver/emit-llvm.c | 10 |
2 files changed, 15 insertions, 2 deletions
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index c7eaad338c8..9ba5095aa86 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -739,6 +739,10 @@ Action *Driver::ConstructPhaseAction(const ArgList &Args, phases::ID Phase, case phases::Precompile: return new PrecompileJobAction(Input, types::TY_PCH); case phases::Compile: { + bool HasO4 = false; + if (const Arg *A = Args.getLastArg(options::OPT_O_Group)) + HasO4 = A->getOption().matches(options::OPT_O4); + if (Args.hasArg(options::OPT_fsyntax_only)) { return new CompileJobAction(Input, types::TY_Nothing); } else if (Args.hasArg(options::OPT__analyze, options::OPT__analyze_auto)) { @@ -746,8 +750,7 @@ Action *Driver::ConstructPhaseAction(const ArgList &Args, phases::ID Phase, } else if (Args.hasArg(options::OPT_emit_ast)) { return new CompileJobAction(Input, types::TY_AST); } else if (Args.hasArg(options::OPT_emit_llvm) || - Args.hasArg(options::OPT_flto) || - Args.hasArg(options::OPT_O4)) { + Args.hasArg(options::OPT_flto) || HasO4) { types::ID Output = Args.hasArg(options::OPT_S) ? types::TY_LLVMAsm : types::TY_LLVMBC; return new CompileJobAction(Input, Output); diff --git a/clang/test/Driver/emit-llvm.c b/clang/test/Driver/emit-llvm.c index e0cc0b5dc21..3439b58d85d 100644 --- a/clang/test/Driver/emit-llvm.c +++ b/clang/test/Driver/emit-llvm.c @@ -1,3 +1,13 @@ // RUN: not %clang -ccc-host-triple i386-pc-linux-gnu -emit-llvm -o %t %s 2> %t.log // RUN: grep 'unable to pass LLVM bit-code files to linker' %t.log +// Check that -O4 is only honored as the effective -O option. +// <rdar://problem/7046672> clang/loader problem + +// RUN: %clang -ccc-print-phases -c -O4 -O0 %s 2> %t +// RUN: FileCheck --check-prefix=O4_AND_O0 %s < %t + +// O4_AND_O0: 0: input, "{{.*}}", c +// O4_AND_O0: 1: preprocessor, {0}, cpp-output +// O4_AND_O0: 2: compiler, {1}, assembler +// O4_AND_O0: 3: assembler, {2}, object |
